Refactor: reduce complexity.
Merge pull request #26 from nlf/develop

Refactor: reduce complexity.