Move helper to its own module