Cleanup based on reports from Michael Bloom
7 files changed