Minor updates: format, comments, etc.
Fixed Doxygen comments