Updating after code formatting and doxygen improvements