cleaned up some comments
removed unnecessary variables