Refactor.
Merge pull request #1 from Nkzn/master

Refactor by Nkzn.