diff --git a/src/views/notifications.html b/src/views/notifications.html
index 63749bb17..74f8aba23 100644
--- a/src/views/notifications.html
+++ b/src/views/notifications.html
@@ -1,14 +1,14 @@
 <div class="content">
 
   <div class="text-left">
-    <h1>{{ 'notifications.title' | tr }} <button class="btn btn-primary btn-outline pull-right" ng-click="notifications.clearAll()" ng-disabled="clearAllBusy"><i class="fa fa-circle-notch fa-spin" ng-show="clearAllBusy"></i><i class="fa fa-check" ng-hide="clearAllBusy"></i> {{ 'notifications.clearAll' | tr }}</button></h1>
+    <h1>{{ 'notifications.title' | tr }} <button class="btn btn-primary btn-outline pull-right" ng-click="clearAll()" ng-disabled="clearAllBusy"><i class="fa fa-circle-notch fa-spin" ng-show="clearAllBusy"></i><i class="fa fa-check" ng-hide="clearAllBusy"></i> {{ 'notifications.clearAll' | tr }}</button></h1>
   </div>
 
-  <div class="col-lg-12 text-center" ng-show="notifications.busy">
+  <div class="col-lg-12 text-center" ng-show="busy">
     <h2><i class="fa fa-circle-notch fa-spin"></i></h2>
   </div>
 
-  <div class="card" ng-hide="notifications.busy || notifications.notifications.length">
+  <div class="card" ng-hide="busy || notifications.length">
     <div class="row">
       <div class="col-xs-12">
           <h3 class="text-center" style="margin: 20px;">{{ 'notifications.nonePending' | tr }}</h3>
@@ -16,14 +16,14 @@
     </div>
   </div>
 
-  <div class="card notification-item" ng-repeat="notification in notifications.notifications">
+  <div class="card notification-item" ng-repeat="notification in notifications">
     <div class="row">
       <div class="col-xs-12" ng-click="notification.isCollapsed = !notification.isCollapsed" ng-class="{ 'notification-details': notification.detailsShown }">
         <span ng-class="{'text-bold': !notification.acknowledged }">{{ notification.title }}</span> <small class="text-muted" uib-tooltip="{{ notification.creationTime | prettyLongDate }}">{{ notification.creationTime | prettyDate }}</small>
         <!-- hidden for now since it seems overkill to have "unread" -->
-        <!-- <button class="btn btn-xs btn-default pull-right" ng-show="notification.acknowledged" ng-click="notifications.ack(notification, false, $event)" uib-tooltip="{{ 'notifications.dismissTooltip' | tr }}"><i class="fa fa-asterisk"></i></button> -->
+        <!-- <button class="btn btn-xs btn-default pull-right" ng-show="notification.acknowledged" ng-click="ack(notification, false, $event)" uib-tooltip="{{ 'notifications.dismissTooltip' | tr }}"><i class="fa fa-asterisk"></i></button> -->
 
-        <div uib-collapse="notification.isCollapsed" expanding="notifications.ack(notification, true)">
+        <div uib-collapse="notification.isCollapsed" expanding="ack(notification, true)">
           <br/>
           <p ng-hide="notification.messageJson" ng-click="$event.stopPropagation();" style="cursor: auto; overflow: auto;" ng-bind-html="notification.message | markdown2html"></p>
           <pre ng-show="notification.messageJson" ng-click="$event.stopPropagation();" style="cursor: auto">{{ notification.messageJson | json }}</pre>
diff --git a/src/views/notifications.js b/src/views/notifications.js
index 506a4f13b..ee066fc2d 100644
--- a/src/views/notifications.js
+++ b/src/views/notifications.js
@@ -6,69 +6,67 @@
 angular.module('Application').controller('NotificationsController', ['$scope', '$timeout', 'Client', function ($scope, $timeout, Client) {
     $scope.clearAllBusy = false;
 
-    $scope.notifications = {
-        notifications: [],
-        activeNotification: null,
-        busy: true,
+    $scope.notifications = [];
+    $scope.activeNotification = null;
+    $scope.busy = true;
 
-        refresh: function () {
-            Client.getNotifications({}, 1, 100, function (error, result) {
-                if (error) return console.error(error);
+    $scope.refresh = function () {
+        Client.getNotifications({}, 1, 100, function (error, result) {
+            if (error) return console.error(error);
 
-                // collapse by default
-                result.forEach(function (r) { r.isCollapsed = true; });
+            // collapse by default
+            result.forEach(function (r) { r.isCollapsed = true; });
 
-                // attempt to parse the message as json
-                result.forEach(function (r) {
-                    try {
-                        r.messageJson = JSON.parse(r.message);
-                    } catch (e) {}
-                });
-
-                $scope.notifications.notifications = result;
-
-                $scope.notifications.busy = false;
+            // attempt to parse the message as json
+            result.forEach(function (r) {
+                try {
+                    r.messageJson = JSON.parse(r.message);
+                } catch (e) {}
             });
-        },
 
-        ack: function (notification, acked, event) {
-            if (event) event.stopPropagation();
+            $scope.notifications = result;
 
-            if (notification.acknowledged === acked) return;
+            $scope.busy = false;
+        });
+    };
 
-            Client.ackNotification(notification.id, acked, function (error) {
-                if (error) console.error(error);
+    $scope.ack = function (notification, acked, event) {
+        if (event) event.stopPropagation();
 
-                notification.acknowledged = acked;
-                $scope.$parent.notificationAcknowledged(acked);
+        if (notification.acknowledged === acked) return;
+
+        Client.ackNotification(notification.id, acked, function (error) {
+            if (error) console.error(error);
+
+            notification.acknowledged = acked;
+            $scope.$parent.notificationAcknowledged(acked);
+        });
+    };
+
+    $scope.clearAll = function () {
+        $scope.clearAllBusy = true;
+
+        async.eachLimit($scope.notifications, 20, function (notification, callback) {
+            if (notification.acknowledged) return callback();
+
+            Client.ackNotification(notification.id, true, function (error) {
+                if (error) {
+                    console.error(error);
+                } else {
+                    notification.acknowledged = true;
+                    $scope.$parent.notificationAcknowledged(true);
+                }
+
+                callback();
             });
-        },
+        }, function (error) {
+            if (error) console.error(error);
 
-        clearAll: function () {
-            $scope.clearAllBusy = true;
-
-            async.eachLimit($scope.notifications.notifications, 20, function (notification, callback) {
-                if (notification.acknowledged) return callback();
-
-                Client.ackNotification(notification.id, true, function (error) {
-                    if (error) {
-                        console.error(error);
-                    } else {
-                        notification.acknowledged = true;
-                        $scope.$parent.notificationAcknowledged(true);
-                    }
-
-                    callback();
-                });
-            }, function (error) {
-                if (error) console.error(error);
-
-                $scope.clearAllBusy = false;
-            });
-        }
+            $scope.clearAllBusy = false;
+        });
     };
 
     Client.onReady(function () {
-        $scope.notifications.refresh();
+        $scope.refresh();
     });
 }]);