Clean up code
Finish code cleanup
Merge pull request #2 from indiesquidge/organize-folder

Clean up code