clean-up
doxygen added