diff --git a/app/mixins/google-pageview.js b/app/mixins/google-pageview.js
index 1590444..daf6822 100644
--- a/app/mixins/google-pageview.js
+++ b/app/mixins/google-pageview.js
@@ -1,31 +1,30 @@
 import Ember from 'ember';
 import ENV from '../config/environment';
 
-export default Ember.Mixin.create({
-  beforePageviewToGA: function (ga) {
+const {Mixin, get, getWithDefault, on} = Ember;
 
-  },
+export default Mixin.create({
+  beforePageviewToGA: function (ga) {},
 
-  pageviewToGA: Ember.on('didTransition', function(page, title) {
-    var page = page ? page : this.get('url');
-    var title = title ? title : this.get('url');
-
-    if (Ember.get(ENV, 'googleAnalytics.webPropertyId') != null) {
-      var trackerType = Ember.getWithDefault(ENV, 'googleAnalytics.tracker', 'analytics.js');
+  pageviewToGA: on('didTransition', function(page, title) {
+    const page = page ? page : get(this, 'url');
+    const title = title ? title : get(this, 'url');
+    const webPropertyId = get(ENV, 'googleAnalytics.webPropertyId')
+    
+    if (webPropertyId != null) {
+      const trackerType = getWithDefault(ENV, 'googleAnalytics.tracker', 'analytics.js');
 
       if (trackerType === 'analytics.js') {
-        var globalVariable = Ember.getWithDefault(ENV, 'googleAnalytics.globalVariable', 'ga');
+        const globalVariable = getWithDefault(ENV, 'googleAnalytics.globalVariable', 'ga');
 
         this.beforePageviewToGA(window[globalVariable]);
 
-        window[globalVariable]('send', 'pageview', {
-          page: page,
-          title: title
-        });
+        window[globalVariable]('set', 'page', page);
+        window[globalVariable]('set', 'title', title);
+        window[globalVariable]('send', 'pageview');
       } else if (trackerType === 'ga.js') {
         window._gaq.push(['_trackPageview']);
       }
     }
   })
-
 });