Moved helpers into file