a little refactoring
Merge pull request #4 from stevendgonzales/master

a little refactoring