Fix single-line doxygen syntax
Cleanup and document