Move helpers to a dedicated file