adding comments, cleanup