Refactor to make it a bit easier to understand
Merge pull request #4 from SixArm/master

Refactor for ease of reading