Code cleanup
6 files changed