cleanup, comments, etc