Major style fixes