diff --git a/aurelia-leaflet/helpers/layer-factory.d.ts b/aurelia-leaflet/helpers/layer-factory.d.ts
index e712885..6c2639c 100644
--- a/aurelia-leaflet/helpers/layer-factory.d.ts
+++ b/aurelia-leaflet/helpers/layer-factory.d.ts
@@ -1,8 +1,6 @@
 import {
   AureliaLeafletException
 } from '../aurelia-leaflet-exceptions';
-
-//export default class LayerFactory {
 export declare class LayerFactory {
   constructor(Leaflet?: any);
   getLayer(layer?: any): any;
diff --git a/aurelia-leaflet/leaflet.d.ts b/aurelia-leaflet/leaflet.d.ts
index 38c9e7e..920cc6d 100644
--- a/aurelia-leaflet/leaflet.d.ts
+++ b/aurelia-leaflet/leaflet.d.ts
@@ -18,9 +18,8 @@ import {
   LayerFactory
 } from './helpers/layer-factory';
 import * as Leaflet from 'leaflet';
-
-//@inject(L.L, EventAggregator, Element)
 export declare class LeafletCustomElement {
+  static inject: any;
   layers: any;
   mapEvents: any;
   mapOptions: any;
diff --git a/dist/amd/leaflet.html b/dist/amd/leaflet.html
index b75b078..c6b0bc9 100644
--- a/dist/amd/leaflet.html
+++ b/dist/amd/leaflet.html
@@ -1,4 +1,3 @@
 <template>
-  a-leaflet test
   <div ref="mapContainer"></div>
 </template>
diff --git a/dist/amd/leaflet.js b/dist/amd/leaflet.js
index a4b1242..9524ec4 100644
--- a/dist/amd/leaflet.js
+++ b/dist/amd/leaflet.js
@@ -70,9 +70,9 @@ define(['exports', 'aurelia-framework', 'aurelia-event-aggregator', './aurelia-l
     throw new Error('Decorating class property failed. Please ensure that transform-class-properties is enabled.');
   }
 
-  var _dec, _dec2, _dec3, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
+  var _dec, _dec2, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _class3, _temp;
 
-  var LeafletCustomElement = exports.LeafletCustomElement = (_dec = (0, _aureliaFramework.customElement)('leaflet'), _dec2 = (0, _aureliaFramework.useView)('./leaflet.html'), _dec3 = (0, _aureliaFramework.inject)(_aureliaEventAggregator.EventAggregator, Element), _dec(_class = _dec2(_class = _dec3(_class = (_class2 = function () {
+  var LeafletCustomElement = exports.LeafletCustomElement = (_dec = (0, _aureliaFramework.customElement)('leaflet'), _dec2 = (0, _aureliaFramework.useView)('./leaflet.html'), _dec(_class = _dec2(_class = (_class2 = (_temp = _class3 = function () {
     function LeafletCustomElement(eventAggregator, element) {
       var _this = this;
 
@@ -383,7 +383,7 @@ define(['exports', 'aurelia-framework', 'aurelia-event-aggregator', './aurelia-l
     };
 
     return LeafletCustomElement;
-  }(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'layers', [_aureliaFramework.bindable], {
+  }(), _class3.inject = [_aureliaEventAggregator.EventAggregator, Element], _temp), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'layers', [_aureliaFramework.bindable], {
     enumerable: true,
     initializer: null
   }), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, 'mapEvents', [_aureliaFramework.bindable], {
@@ -398,5 +398,5 @@ define(['exports', 'aurelia-framework', 'aurelia-event-aggregator', './aurelia-l
   }), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, 'withScaleControl', [_aureliaFramework.bindable], {
     enumerable: true,
     initializer: null
-  })), _class2)) || _class) || _class) || _class);
+  })), _class2)) || _class) || _class);
 });
\ No newline at end of file
diff --git a/dist/aurelia-leaflet.js b/dist/aurelia-leaflet.js
index 8768cda..dce787e 100644
--- a/dist/aurelia-leaflet.js
+++ b/dist/aurelia-leaflet.js
@@ -34,10 +34,8 @@ export var defaultLayers = {
 
 @customElement('leaflet')
 @useView('./leaflet.html')
-//@inject(L.L, EventAggregator, Element)
-@inject(EventAggregator, Element)
 export class LeafletCustomElement {
-//  static inject = [Leaflet, EventAggregator, Element];
+  static inject = [EventAggregator, Element];
 
   @bindable layers;
   @bindable mapEvents;
@@ -245,7 +243,6 @@ export class LeafletCustomElement {
 
 }
 
-//export default class LayerFactory {
 export class LayerFactory {
 
   constructor(Leaflet) {
diff --git a/dist/commonjs/leaflet.html b/dist/commonjs/leaflet.html
index b75b078..c6b0bc9 100644
--- a/dist/commonjs/leaflet.html
+++ b/dist/commonjs/leaflet.html
@@ -1,4 +1,3 @@
 <template>
-  a-leaflet test
   <div ref="mapContainer"></div>
 </template>
diff --git a/dist/commonjs/leaflet.js b/dist/commonjs/leaflet.js
index 31ab297..f0df327 100644
--- a/dist/commonjs/leaflet.js
+++ b/dist/commonjs/leaflet.js
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.LeafletCustomElement = undefined;
 
-var _dec, _dec2, _dec3, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
+var _dec, _dec2, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _class3, _temp;
 
 var _aureliaFramework = require('aurelia-framework');
 
@@ -68,7 +68,7 @@ function _initializerWarningHelper(descriptor, context) {
   throw new Error('Decorating class property failed. Please ensure that transform-class-properties is enabled.');
 }
 
-var LeafletCustomElement = exports.LeafletCustomElement = (_dec = (0, _aureliaFramework.customElement)('leaflet'), _dec2 = (0, _aureliaFramework.useView)('./leaflet.html'), _dec3 = (0, _aureliaFramework.inject)(_aureliaEventAggregator.EventAggregator, Element), _dec(_class = _dec2(_class = _dec3(_class = (_class2 = function () {
+var LeafletCustomElement = exports.LeafletCustomElement = (_dec = (0, _aureliaFramework.customElement)('leaflet'), _dec2 = (0, _aureliaFramework.useView)('./leaflet.html'), _dec(_class = _dec2(_class = (_class2 = (_temp = _class3 = function () {
   function LeafletCustomElement(eventAggregator, element) {
     var _this = this;
 
@@ -379,7 +379,7 @@ var LeafletCustomElement = exports.LeafletCustomElement = (_dec = (0, _aureliaFr
   };
 
   return LeafletCustomElement;
-}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'layers', [_aureliaFramework.bindable], {
+}(), _class3.inject = [_aureliaEventAggregator.EventAggregator, Element], _temp), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'layers', [_aureliaFramework.bindable], {
   enumerable: true,
   initializer: null
 }), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, 'mapEvents', [_aureliaFramework.bindable], {
@@ -394,4 +394,4 @@ var LeafletCustomElement = exports.LeafletCustomElement = (_dec = (0, _aureliaFr
 }), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, 'withScaleControl', [_aureliaFramework.bindable], {
   enumerable: true,
   initializer: null
-})), _class2)) || _class) || _class) || _class);
\ No newline at end of file
+})), _class2)) || _class) || _class);
\ No newline at end of file
diff --git a/dist/es2015/leaflet.html b/dist/es2015/leaflet.html
index b75b078..c6b0bc9 100644
--- a/dist/es2015/leaflet.html
+++ b/dist/es2015/leaflet.html
@@ -1,4 +1,3 @@
 <template>
-  a-leaflet test
   <div ref="mapContainer"></div>
 </template>
diff --git a/dist/es2015/leaflet.js b/dist/es2015/leaflet.js
index 25c8c5d..50a8800 100644
--- a/dist/es2015/leaflet.js
+++ b/dist/es2015/leaflet.js
@@ -1,4 +1,4 @@
-var _dec, _dec2, _dec3, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
+var _dec, _dec2, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _class3, _temp;
 
 function _initDefineProp(target, property, descriptor, context) {
   if (!descriptor) return;
@@ -50,7 +50,7 @@ import { defaultMapOptions, defaultLayers } from './leaflet-defaults';
 import { LayerFactory } from './helpers/layer-factory';
 import * as Leaflet from 'leaflet';
 
-export let LeafletCustomElement = (_dec = customElement('leaflet'), _dec2 = useView('./leaflet.html'), _dec3 = inject(EventAggregator, Element), _dec(_class = _dec2(_class = _dec3(_class = (_class2 = class LeafletCustomElement {
+export let LeafletCustomElement = (_dec = customElement('leaflet'), _dec2 = useView('./leaflet.html'), _dec(_class = _dec2(_class = (_class2 = (_temp = _class3 = class LeafletCustomElement {
 
   constructor(eventAggregator, element) {
     _initDefineProp(this, 'layers', _descriptor, this);
@@ -255,7 +255,7 @@ export let LeafletCustomElement = (_dec = customElement('leaflet'), _dec2 = useV
     return id;
   }
 
-}, (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'layers', [bindable], {
+}, _class3.inject = [EventAggregator, Element], _temp), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'layers', [bindable], {
   enumerable: true,
   initializer: null
 }), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, 'mapEvents', [bindable], {
@@ -270,4 +270,4 @@ export let LeafletCustomElement = (_dec = customElement('leaflet'), _dec2 = useV
 }), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, 'withScaleControl', [bindable], {
   enumerable: true,
   initializer: null
-})), _class2)) || _class) || _class) || _class);
\ No newline at end of file
+})), _class2)) || _class) || _class);
\ No newline at end of file
diff --git a/dist/native-modules/leaflet.html b/dist/native-modules/leaflet.html
index b75b078..c6b0bc9 100644
--- a/dist/native-modules/leaflet.html
+++ b/dist/native-modules/leaflet.html
@@ -1,4 +1,3 @@
 <template>
-  a-leaflet test
   <div ref="mapContainer"></div>
 </template>
diff --git a/dist/native-modules/leaflet.js b/dist/native-modules/leaflet.js
index b72b31a..5dc273d 100644
--- a/dist/native-modules/leaflet.js
+++ b/dist/native-modules/leaflet.js
@@ -1,4 +1,4 @@
-var _dec, _dec2, _dec3, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5;
+var _dec, _dec2, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _class3, _temp;
 
 function _initDefineProp(target, property, descriptor, context) {
   if (!descriptor) return;
@@ -52,7 +52,7 @@ import { defaultMapOptions, defaultLayers } from './leaflet-defaults';
 import { LayerFactory } from './helpers/layer-factory';
 import * as Leaflet from 'leaflet';
 
-export var LeafletCustomElement = (_dec = customElement('leaflet'), _dec2 = useView('./leaflet.html'), _dec3 = inject(EventAggregator, Element), _dec(_class = _dec2(_class = _dec3(_class = (_class2 = function () {
+export var LeafletCustomElement = (_dec = customElement('leaflet'), _dec2 = useView('./leaflet.html'), _dec(_class = _dec2(_class = (_class2 = (_temp = _class3 = function () {
   function LeafletCustomElement(eventAggregator, element) {
     var _this = this;
 
@@ -363,7 +363,7 @@ export var LeafletCustomElement = (_dec = customElement('leaflet'), _dec2 = useV
   };
 
   return LeafletCustomElement;
-}(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'layers', [bindable], {
+}(), _class3.inject = [EventAggregator, Element], _temp), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'layers', [bindable], {
   enumerable: true,
   initializer: null
 }), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, 'mapEvents', [bindable], {
@@ -378,4 +378,4 @@ export var LeafletCustomElement = (_dec = customElement('leaflet'), _dec2 = useV
 }), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, 'withScaleControl', [bindable], {
   enumerable: true,
   initializer: null
-})), _class2)) || _class) || _class) || _class);
\ No newline at end of file
+})), _class2)) || _class) || _class);
\ No newline at end of file
diff --git a/dist/system/leaflet.html b/dist/system/leaflet.html
index b75b078..c6b0bc9 100644
--- a/dist/system/leaflet.html
+++ b/dist/system/leaflet.html
@@ -1,4 +1,3 @@
 <template>
-  a-leaflet test
   <div ref="mapContainer"></div>
 </template>
diff --git a/dist/system/leaflet.js b/dist/system/leaflet.js
index 7464297..e6a980d 100644
--- a/dist/system/leaflet.js
+++ b/dist/system/leaflet.js
@@ -3,7 +3,7 @@
 System.register(['aurelia-framework', 'aurelia-event-aggregator', './aurelia-leaflet-exceptions', './leaflet-defaults', './helpers/layer-factory', 'leaflet'], function (_export, _context) {
   "use strict";
 
-  var inject, customElement, useView, bindable, EventAggregator, AureliaLeafletException, defaultMapOptions, defaultLayers, LayerFactory, Leaflet, _dec, _dec2, _dec3, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, LeafletCustomElement;
+  var inject, customElement, useView, bindable, EventAggregator, AureliaLeafletException, defaultMapOptions, defaultLayers, LayerFactory, Leaflet, _dec, _dec2, _class, _desc, _value, _class2, _descriptor, _descriptor2, _descriptor3, _descriptor4, _descriptor5, _class3, _temp, LeafletCustomElement;
 
   function _initDefineProp(target, property, descriptor, context) {
     if (!descriptor) return;
@@ -69,7 +69,7 @@ System.register(['aurelia-framework', 'aurelia-event-aggregator', './aurelia-lea
       Leaflet = _leaflet;
     }],
     execute: function () {
-      _export('LeafletCustomElement', LeafletCustomElement = (_dec = customElement('leaflet'), _dec2 = useView('./leaflet.html'), _dec3 = inject(EventAggregator, Element), _dec(_class = _dec2(_class = _dec3(_class = (_class2 = function () {
+      _export('LeafletCustomElement', LeafletCustomElement = (_dec = customElement('leaflet'), _dec2 = useView('./leaflet.html'), _dec(_class = _dec2(_class = (_class2 = (_temp = _class3 = function () {
         function LeafletCustomElement(eventAggregator, element) {
           var _this = this;
 
@@ -380,7 +380,7 @@ System.register(['aurelia-framework', 'aurelia-event-aggregator', './aurelia-lea
         };
 
         return LeafletCustomElement;
-      }(), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'layers', [bindable], {
+      }(), _class3.inject = [EventAggregator, Element], _temp), (_descriptor = _applyDecoratedDescriptor(_class2.prototype, 'layers', [bindable], {
         enumerable: true,
         initializer: null
       }), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, 'mapEvents', [bindable], {
@@ -395,7 +395,7 @@ System.register(['aurelia-framework', 'aurelia-event-aggregator', './aurelia-lea
       }), _descriptor5 = _applyDecoratedDescriptor(_class2.prototype, 'withScaleControl', [bindable], {
         enumerable: true,
         initializer: null
-      })), _class2)) || _class) || _class) || _class));
+      })), _class2)) || _class) || _class));
 
       _export('LeafletCustomElement', LeafletCustomElement);
     }
diff --git a/src/helpers/layer-factory.js b/src/helpers/layer-factory.js
index f846e66..114a9e2 100644
--- a/src/helpers/layer-factory.js
+++ b/src/helpers/layer-factory.js
@@ -1,6 +1,5 @@
 import {AureliaLeafletException} from '../aurelia-leaflet-exceptions';
 
-//export default class LayerFactory {
 export class LayerFactory {
 
   constructor(Leaflet) {
diff --git a/src/leaflet.html b/src/leaflet.html
index b75b078..c6b0bc9 100644
--- a/src/leaflet.html
+++ b/src/leaflet.html
@@ -1,4 +1,3 @@
 <template>
-  a-leaflet test
   <div ref="mapContainer"></div>
 </template>
diff --git a/src/leaflet.js b/src/leaflet.js
index 8ba098d..4670688 100644
--- a/src/leaflet.js
+++ b/src/leaflet.js
@@ -7,10 +7,8 @@ import * as Leaflet from 'leaflet';
 
 @customElement('leaflet')
 @useView('./leaflet.html')
-//@inject(L.L, EventAggregator, Element)
-@inject(EventAggregator, Element)
 export class LeafletCustomElement {
-//  static inject = [Leaflet, EventAggregator, Element];
+  static inject = [EventAggregator, Element];
 
   @bindable layers;
   @bindable mapEvents;