Cleaned up init.el logic to use when instead of if... progn