More code cleanup
13 files changed