Cleaned up the code for init.el