Implementing tweaks from vimcasts