Split helpers into separate modules