clean up on formatting and add Doxygen