Cleanup to code and comments

Some basic cleanup to code and comments found in the process up updating my copy.