A little bit of cleanup

Just some small cleanup stuff. You will have to change the mapping in your .vimrc to reflect the changes in the readme file. It is important not to use `noremap` versions but "normal" ones instead.