More doxygen-ing