Code cleanup
27 files changed