cleaned up some code and added comments