Move helpers into their own file