more small streamlining