-removed unused code
-changed some code comments