cleaning up comments, set 1