added comments and some clean up from the hackathon