Cleaned up Doxygen