Minor code review for chnages on analytics