Clean up
Merge pull request #4 from Caf131/dev-doo-dah-cforehand

Clean up