WIP: some cleanup & Doxygen comments