Refactor/Clean up code
Merge pull request #1 from joshtombs/Refactor_Code

Refactor/Clean up code