Some more streamlining