diff --git a/src/client/app.js b/src/client/app.js
index 10f01c43..51fbb41c 100644
--- a/src/client/app.js
+++ b/src/client/app.js
@@ -12,6 +12,10 @@ import AppController from './controllers/AppController';
 import HomeController from './controllers/HomeController';
 import TeamController from './controllers/TeamController';
 import DocumentsController from './controllers/DocumentsController';
+import RemoveHashtags from './filters/RemoveHashtags';
+import RemoveNewline from './filters/RemoveNewline';
+import Strip from './filters/Strip';
+import UppercaseFirst from './filters/UppercaseFirst';
 import IOService from './services/io';
 import MenuService from './services/menu';
 import api from './api/api';
@@ -93,11 +97,11 @@ app.run(($location, $rootScope, $http) => {
     api,
     IOService,
     MenuService,
+    RemoveHashtags,
+    RemoveNewline,
+    Strip,
+    UppercaseFirst,
     require('./ui/timeline'),
-    require('./filters/strip'),
-    require('./filters/remove-hashtags'),
-    require('./filters/removeNewline'),
-    require('./filters/uppercase-first'),
     require('./pages/schedule'),
     require('./pages/gallery'),
     require('./controllers/ContactsController'),
diff --git a/src/client/filters/RemoveHashtags.js b/src/client/filters/RemoveHashtags.js
new file mode 100644
index 00000000..67b7f08d
--- /dev/null
+++ b/src/client/filters/RemoveHashtags.js
@@ -0,0 +1,5 @@
+export default function(app) {
+    app.filter('removeHashtags', () => {
+        return string => string.replace(/(#[^\s]+)/g, '');
+    });
+};
diff --git a/src/client/filters/UppercaseFirst.js b/src/client/filters/UppercaseFirst.js
new file mode 100644
index 00000000..ea47ea56
--- /dev/null
+++ b/src/client/filters/UppercaseFirst.js
@@ -0,0 +1,5 @@
+export default function(app) {
+    app.filter('uppercaseFirst', () => {
+        return string => string.charAt(0).toUpperCase() + string.slice(1);
+    });
+};
diff --git a/src/client/filters/remove-hashtags.js b/src/client/filters/remove-hashtags.js
deleted file mode 100644
index 80abf377..00000000
--- a/src/client/filters/remove-hashtags.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Created by tmshv on 21/11/14.
- */
-
-module.exports = function(app) {
-    app.filter("removeHashtags", function () {
-        return function(string) {
-            return string.replace(/(#[^\s]+)/g, '');
-        };
-    });
-};
diff --git a/src/client/filters/removeNewline.js b/src/client/filters/removeNewline.js
index 15831ccd..345a4d31 100644
--- a/src/client/filters/removeNewline.js
+++ b/src/client/filters/removeNewline.js
@@ -1,11 +1,5 @@
-/**
- * Created by tmshv on 21/11/14.
- */
-
-module.exports = function(app) {
-    app.filter("removeNewline", function () {
-        return function(string) {
-            return string.replace(/(\n)/g, ' ');
-        };
+export default function(app) {
+    app.filter('removeNewline', () =>{
+        return string => string.replace(/(\n)/g, ' ');
     });
 };
diff --git a/src/client/filters/strip.js b/src/client/filters/strip.js
index 67eec958..ad47f6f3 100644
--- a/src/client/filters/strip.js
+++ b/src/client/filters/strip.js
@@ -1,13 +1,7 @@
-/**
- * Created by tmshv on 21/11/14.
- */
-
-module.exports = function(app) {
-    app.filter("strip", function () {
-        return function(string) {
-            return string
-                .replace(/^\s+/, '')
-                .replace(/\s+$/, '');
-        };
+export default function (app) {
+    app.filter('strip', () => {
+        return string => string
+            .replace(/^\s+/, '')
+            .replace(/\s+$/, '');
     });
 };
diff --git a/src/client/filters/uppercase-first.js b/src/client/filters/uppercase-first.js
deleted file mode 100644
index cfa78eb7..00000000
--- a/src/client/filters/uppercase-first.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Created by tmshv on 21/11/14.
- */
-
-module.exports = function(app) {
-    app.filter("uppercaseFirst", function () {
-        return function(string) {
-            return string.charAt(0).toUpperCase() + string.slice(1);
-        };
-    });
-};