Code cleanup
3 files changed