refactor for Doxygen