Cleaned up in LinKernighan