Yes, makes sense to move them all in init. Just make sure to run all the tests after doing this.... make sure we don't break anything due to this.