Getting it cleaned up from trying analytics