cleaned up various things from the code review
5 files changed