Refactor
Merge pull request #2 from ikstrm/refactor

Refactor.