diff --git a/src/notifications.js b/src/notifications.js
index cde5bd220d..12a42dc300 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -1,121 +1,125 @@
 var	RDB = require('./redis.js'),
 	async = require('async'),
-	utils = require('../public/src/utils.js');
+	utils = require('../public/src/utils.js'),
 
-(function(Notifications) {
-	Notifications.get = function(nid, callback) {
-		RDB.hmget('notifications:' + nid, 'text', 'score', 'path', 'datetime', 'uniqueId', function(err, notification) {
-			callback({
-				nid: nid,
-				text: notification[0],
-				score: notification[1],
-				path: notification[2],
-				datetime: notification[3],
-				uniqueId: notification[4]
+	notifications = {
+		get: function(nid, callback) {
+			RDB.hmget('notifications:' + nid, 'text', 'score', 'path', 'datetime', 'uniqueId', function(err, notification) {
+				callback({
+					nid: nid,
+					text: notification[0],
+					score: notification[1],
+					path: notification[2],
+					datetime: notification[3],
+					uniqueId: notification[4]
+				});
 			});
-		});
-	}
-
-	Notifications.create = function(text, score, path, uniqueId, callback) {
-		/*
-		 * Score guide:
-		 * 0	Low priority messages (probably unused)
-		 * 5	Normal messages
-		 * 10	High priority messages
-		 *
-		 * uniqueId is used solely to override stale nids.
-		 * 		If a new nid is pushed to a user and an existing nid in the user's
-		 *		(un)read list contains the same uniqueId, it will be removed, and
-		 *		the new one put in its place.
-		 */
-		RDB.incr('notifications:next_nid', function(err, nid) {
-			RDB.hmset(
-				'notifications:' + nid,
-				'text', text || '',
-				'score', score || 5,
-				'path', path || null,
-				'datetime', Date.now(),
-				'uniqueId', uniqueId || utils.generateUUID(),
-			function(err, status) {
-				if (status === 'OK') callback(nid);
+		},
+		create: function(text, score, path, uniqueId, callback) {
+			/*
+			 * Score guide:
+			 * 0	Low priority messages (probably unused)
+			 * 5	Normal messages
+			 * 10	High priority messages
+			 *
+			 * uniqueId is used solely to override stale nids.
+			 * 		If a new nid is pushed to a user and an existing nid in the user's
+			 *		(un)read list contains the same uniqueId, it will be removed, and
+			 *		the new one put in its place.
+			 */
+			RDB.incr('notifications:next_nid', function(err, nid) {
+				RDB.hmset(
+					'notifications:' + nid,
+					'text', text || '',
+					'score', score || 5,
+					'path', path || null,
+					'datetime', Date.now(),
+					'uniqueId', uniqueId || utils.generateUUID(),
+				function(err, status) {
+					if (status === 'OK') callback(nid);
+				});
 			});
-		});
-	}
+		},
+		push: function(nid, uids, callback) {
+			if (!Array.isArray(uids)) uids = [uids];
 
-	Notifications.push = function(nid, uids, callback) {
-		if (!Array.isArray(uids)) uids = [uids];
+			var	numUids = uids.length,
+				x;
 
-		var	numUids = uids.length,
-			x;
-
-		Notifications.get(nid, function(notif_data) {
-			for(x=0;x<numUids;x++) {
-				if (parseInt(uids[x]) > 0) {
-					(function(uid) {
-						Notifications.remove_by_uniqueId(notif_data.uniqueId, uid, function() {
-							RDB.zadd('uid:' + uid + ':notifications:unread', notif_data.score, nid);
-							RDB.set('uid:' + uid + ':notifications:flag', 1);
-							global.io.sockets.in('uid_' + uid).emit('event:new_notification');
-							if (callback) callback(true);
-						});
-					})(uids[x]);
+			notifications.get(nid, function(notif_data) {
+				for(x=0;x<numUids;x++) {
+					if (parseInt(uids[x]) > 0) {
+						(function(uid) {
+							notifications.remove_by_uniqueId(notif_data.uniqueId, uid, function() {
+								RDB.zadd('uid:' + uid + ':notifications:unread', notif_data.score, nid);
+								RDB.set('uid:' + uid + ':notifications:flag', 1);
+								global.io.sockets.in('uid_' + uid).emit('event:new_notification');
+								if (callback) callback(true);
+							});
+						})(uids[x]);
+					}
 				}
-			}
-		});
-	}
-
-	Notifications.remove_by_uniqueId = function(uniqueId, uid, callback) {
-		async.parallel([
-			function(next) {
-				RDB.zrange('uid:' + uid + ':notifications:unread', 0, -1, function(err, nids) {
-					if (nids && nids.length > 0) {
-						async.each(nids, function(nid, next) {
-							Notifications.get(nid, function(nid_info) {
-								if (nid_info.uniqueId === uniqueId) RDB.zrem('uid:' + uid + ':notifications:unread', nid);
+			});
+		},
+		remove_by_uniqueId: function(uniqueId, uid, callback) {
+			async.parallel([
+				function(next) {
+					RDB.zrange('uid:' + uid + ':notifications:unread', 0, -1, function(err, nids) {
+						if (nids && nids.length > 0) {
+							async.each(nids, function(nid, next) {
+								notifications.get(nid, function(nid_info) {
+									if (nid_info.uniqueId === uniqueId) RDB.zrem('uid:' + uid + ':notifications:unread', nid);
+									next();
+								});
+							}, function(err) {
 								next();
 							});
-						}, function(err) {
-							next();
-						});
-					} else next();
-				});
-			},
-			function(next) {
-				RDB.zrange('uid:' + uid + ':notifications:read', 0, -1, function(err, nids) {
-					if (nids && nids.length > 0) {
-						async.each(nids, function(nid, next) {
-							Notifications.get(nid, function(nid_info) {
-								if (nid_info.uniqueId === uniqueId) RDB.zrem('uid:' + uid + ':notifications:read', nid);
+						} else next();
+					});
+				},
+				function(next) {
+					RDB.zrange('uid:' + uid + ':notifications:read', 0, -1, function(err, nids) {
+						if (nids && nids.length > 0) {
+							async.each(nids, function(nid, next) {
+								notifications.get(nid, function(nid_info) {
+									if (nid_info.uniqueId === uniqueId) RDB.zrem('uid:' + uid + ':notifications:read', nid);
+									next();
+								});
+							}, function(err) {
 								next();
 							});
-						}, function(err) {
-							next();
-						});
-					} else next();
+						} else next();
+					});
+				}
+			], function(err) {
+				if (!err) callback(true);
+			});
+		},
+		mark_read: function(nid, uid, callback) {
+			if (parseInt(uid) > 0) {
+				notifications.get(nid, function(notif_data) {
+					RDB.zrem('uid:' + uid + ':notifications:unread', nid);
+					RDB.zadd('uid:' + uid + ':notifications:read', notif_data.score, nid);
+					if (callback) callback(true);
 				});
 			}
-		], function(err) {
-			if (!err) callback(true);
-		});
-	}
+		},
+		mark_read_multiple: function(nids, uid, callback) {
+			if (!Array.isArray(nids) && parseInt(nids, 10) > 0) nids = [nids];
 
-	Notifications.mark_read = function(nid, uid, callback) {
-		if (parseInt(uid) > 0) {
-			Notifications.get(nid, function(notif_data) {
-				RDB.zrem('uid:' + uid + ':notifications:unread', nid);
-				RDB.zadd('uid:' + uid + ':notifications:read', notif_data.score, nid);
-				if (callback) callback(true);
+			async.each(nids, function(nid, next) {
+				notifications.mark_read(nid, uid, function(success) {
+					if (success) next(null);
+				});
+			}, function(err) {
+				if (callback && !err) callback(true);
 			});
 		}
 	}
 
-	Notifications.mark_read_multiple = function(nids, uid, callback) {
-		async.each(nids, function(nid, next) {
-			Notifications.mark_read(nid, uid, function(success) {
-				if (success) next(null);
-			});
-		}, function(err) {
-			if (callback && !err) callback(true);
-		});
-	}
-}(exports));
\ No newline at end of file
+module.exports = {
+	get: notifications.get,
+	create: notifications.create,
+	push: notifications.push,
+	mark_read: notifications.mark_read_multiple
+}
\ No newline at end of file