More streamlining