clean up, comments, todos