Code cleanup
23 files changed