Some further streamlining