Code cleanup
12 files changed