removed commented out code, added furthur comments