Refactor Code
Merge pull request #11 from jdavis/refactor

Refactor Code