Minor streamlining changes