Quick refactoring
Merge pull request #4 from mfpiccolo/another-refactor-pass

Quick refactoring