refactor
Merge pull request #3 from brewster1134/refactor

refactor