enhanced comments for Doxygen
clean-up