(refactor) Refactor, add helpers, add tests
Merge pull request #74 from phoenix16t/refactor/handler

(refactor) Refactor, add helpers, add tests