Refactored
Merge pull request #7 from stevepm/refactor

Refactored