move helpers where they belong