Regular style fixes