minor code streamlining