Startup refactor