Stylistic cleanup
FF support for shift-ctrl-space