neatened up xinitrc