Reduce helpers complexity and duplication