removed useless spaces, improved doxygen comments