cleaned up code and added comments