Factorize stuff into helpers
Factorize more stuff into helpers