Code cleanup
4 files changed