Minor refactoring
Minor refactoring

firebase/firebase-ios-sdk,firebase/firebase-ios-sdk,firebase/firebase-ios-sdk,firebase/firebase-ios-sdk,firebase/firebase-ios-sdk,firebase/firebase-ios-sdk,firebase/firebase-ios-sdk