refactor
Merge pull request #3 from yitznewton/refactor

refactor