Minor improvements to comments, indenting
Improvements to standard output