Eliminated doxygen warnings