minor cleanup and comments
minor cleanup and comments

SKrauth/bounty,justin1dennison/noel_questions,wickersham/bounty,camcginnis/bounty,SKrauth/bounty,camcginnis/bounty,wickersham/bounty,justin1dennison/noel_questions