Use vim to do more formatting