More doxygen and indentation