MOD: Refactored a bit.
Merge branch 'master' of github.com:izzycecil/Paratype