Smoother start and cleanup