Compiler suggested cleanup
7 files changed