streamlining code organization