Vim cleanup and Ack fix