Refactor
Merge pull request #1 from RushPlay/refactor

Refactor