Vim cosmetic changes