Clean up
Merge pull request #15 from difleming/cleanup

Clean up