Removing clutter and adding comments