Streamlining the startup process a bit