Update vim keymaps to don't use inline comments

With inline comments there are a lot of different problems (like
unintentional movements after commands invocation).