Clean-up and refactor
Merge pull request #15 from glenjarvis/chore/clean_up

Clean-up and refactor