xmonad: refactored