Changes to fit the Doxygen