Removed commented out code, added comments