Cleaned up xmonad.hs a bit