general refactoring of helpers and helper implementations
Merge branch 'mikedev'