Moving helpers out of class