Merge pull request #28 from rybern/refactoring

Refactoring
foobarbaz
Merge pull request #29 from jrrideout/cleanup2

foobarbaz