Doxygen cleanup