Vim stuff tidied up nicely