Comments and weeding out some unnecessary code