formatting and doxygen fixes (issue #6300)