minor streamlining