Clean up
Merge pull request #2 from twokul/clean-up

Clean up