refactoring comments and doxygen doc