uncommented and fixed doxygen generation