Refactor
Merge pull request #1 from NotBobTheBuilder/master

Refactor