Refactor.
Merge pull request #15 from serathius/refactor

Refactor.