Some cleanups to Google Analytics implementation