small streamlining updates