Code quality cleanup in NeverDestroyed