Moar style fixes