Moving more things to init.el