some streamlining and clarifying