Bad style fixes