Comments modified for Doxygen, V1