removed some commented out code added some comments