Move helper methods to helpers