Refactoring and tidying up _helpers/util
Merge pull request #2 from bjodah/tidy_up

Refactoring and tidying up _helpers/util