Update doxygen comments
Fix member function name
Re-order headers
Specify an argument as unused