Refactor and change trackEvent parameters

Change-Id: I2e3cac1286e8dd6767e575ae237f7e96cc30de6c