Rationalise casing a bit