Moar style cleanup