Refactoring Helpers module