More cleanup and tweak to doxygen