Minor refactoring
Merge pull request #31 from nickb1080/refactor-misc

Minor refactoring