cleaning up comments, set 2