Moved some functions to utils