Slight changes for better Doxygen output