Clean up
Merge pull request #1 from Drewzar/cleanup

Clean up