Comments added and commented out code deleted