Even more streamlining