Exit insert mode easily

Also some refactoring of sections