Refactor 9-8
Changes 9-8
Changes 9-8
Changes 9-8
Changes 9-9
Changes 9-9
Changes 9-9
Changes 9-9
Changes 9-9
Cleanup 9-18
Changes 9-18
Merge pull request #5 from pumpkincouture/refactor

Refactor