remove namespace from base, conflicts on class extension

Author: Salakar

lib/modules/base.js

@@ -62,10 +62,6 @@ export class Base extends EventEmitter {
     });
   }
 
-  get namespace(): string {
-    return 'firestack:base';
-  }
-
   // Event handlers
   // proxy to firestack instance
   _on(name, cb, nativeModule) {

lib/modules/database/index.js

@@ -71,12 +71,9 @@ export default class Database extends Base {
     const handle = this._handle(path, modifiersString);
     this.log.debug('adding on listener', handle);
 
-    if (this.subscriptions[handle]) {
-      if (this.subscriptions[handle][eventName]) this.subscriptions[handle][eventName].push(cb);
-      else this.subscriptions[handle][eventName] = [cb];
-    } else {
-      this.subscriptions[handle] = { [eventName]: [cb] };
-    }
+    if (!this.subscriptions[handle]) this.subscriptions[handle] = {};
+    if (!this.subscriptions[handle][eventName]) this.subscriptions[handle][eventName] = [];
+    this.subscriptions[handle][eventName].push(cb);
 
     return promisify('on', FirestackDatabase)(path, modifiersString, modifiers, eventName);
   }
@@ -100,16 +97,14 @@ export default class Database extends Base {
 
     if (eventName && origCB) {
       const i = this.subscriptions[handle][eventName].indexOf(origCB);
+
       if (i === -1) {
-        this.log.warn('off() called, but the callback specifed is not listening at that location (bad path)', handle, eventName);
+        this.log.warn('off() called, but the callback specified is not listening at that location (bad path)', handle, eventName);
         return Promise.resolve();
       }
 
-      this.subscriptions[handle][eventName] = this.subscriptions[handle][eventName].splice(i, 1);
-
-      if (this.subscriptions[handle][eventName].length > 0) {
-        return Promise.resolve();
-      }
+      this.subscriptions[handle][eventName].splice(i, 1);
+      if (this.subscriptions[handle][eventName].length > 0) return Promise.resolve();
     } else if (eventName) {
       this.subscriptions[handle][eventName] = [];
     } else {