comments clean up
12 files changed