cleanup and docu