move helpers into class