refactoring
refactoring
Merge pull request #1 from carlbarrdahl/refactor

Refactor