Updated source with Doxygen comments