Refactored google analytics events