cleaning up. getting rid of the comments