Code cleanup
24 files changed