Move more stuff inside init.