Remove vim comments and fix formatting a little.