Clean up
Merge pull request #1 from daguar/clean-up

Clean up