Refactoring, moving helpers