refactor(yarn2)!: Move some `val`s and `fun`s outside of the companion