Clean up init.el a bit