Support for esc-key

and consistent indents