More doxygen comments and cleanup