streamlining some stuff