code cleanup
9 files changed