Refactoring WarriorHelpers module