Code cleanup
14 files changed