Documentation (doxygen conform) and clean up of module