Address a few PR comments
Address a few PR comments

string-team/analytics-ios,djfink-carglass/analytics-ios,segmentio/analytics-ios,djfink-carglass/analytics-ios,string-team/analytics-ios,segmentio/analytics-ios,djfink-carglass/analytics-ios,segmentio/analytics-ios,string-team/analytics-ios,segmentio/analytics-ios