code remarks cleanup and doxygen: #21