moar style fixes