Added final doxygen comments; removed extraneous returns