code cleanup
67 files changed