code cleanup
7 files changed