Minor code streamlining