Improved doxygen comments