Bit of a vim cleanup