Cleanup + doxygen added