comments, review, cleanup