Refactor, doxygen