2nd commit

removed some unnecessary code and added some comments