Merge pull request #110 from bryan-m-hughes/master

Code cleanup