prettying things up
Merge pull request #77 from patrickdmccarthy/cleanup4

prettying things up