adding comments, clean up