Enhanced vim formatting