More streamlining of reduction prototype