Cleaned up code, added mixpanel to point click