Better style fixes