cleanup, comments, dox