SQUASH ME: undo unrelated change and add doxygen