Some cleanup & Doxygen comments