Neater this way
Merge pull request #14 from pikesley/refactor

Neater this way