cleaning up some code and added comments