Refactored Google Analytics