diff --git a/client/src/modules/grades/grades.service.js b/client/src/modules/grades/grades.service.js
index 8661230ea6..a2c97f9c13 100644
--- a/client/src/modules/grades/grades.service.js
+++ b/client/src/modules/grades/grades.service.js
@@ -1,7 +1,7 @@
 angular.module('bhima.services')
   .service('GradeService', GradeService);
 
-GradeService.$inject = ['PrototypeApiService', '$uibModal'];
+GradeService.$inject = ['PrototypeApiService'];
 
 /**
  * @class GradeService
@@ -10,8 +10,6 @@ GradeService.$inject = ['PrototypeApiService', '$uibModal'];
  * @description
  * Encapsulates common requests to the /grades/ URL.
  */
-function GradeService(Api, Modal) {
-  var service = new Api('/grades/');
-
-  return service;
+function GradeService(Api) {
+  return new Api('/grades/');
 }
diff --git a/client/src/modules/holidays/holidays.js b/client/src/modules/holidays/holidays.js
index 2c81d03190..30a9b512fb 100644
--- a/client/src/modules/holidays/holidays.js
+++ b/client/src/modules/holidays/holidays.js
@@ -1,5 +1,5 @@
 angular.module('bhima.controllers')
-.controller('HolidayManagementController', HolidayManagementController);
+  .controller('HolidayManagementController', HolidayManagementController);
 
 HolidayManagementController.$inject = [
   'HolidayService', 'ModalService', 'NotifyService', 'uiGridConstants', '$state',
@@ -12,7 +12,7 @@ HolidayManagementController.$inject = [
  * It's responsible for creating, editing and updating a Holiday
  */
 function HolidayManagementController(Holidays, ModalService, Notify, uiGridConstants, $state) {
-  var vm = this;
+  const vm = this;
 
   // bind methods
   vm.deleteHoliday = deleteHoliday;
@@ -87,28 +87,28 @@ function HolidayManagementController(Holidays, ModalService, Notify, uiGridConst
     vm.loading = true;
 
     Holidays.read(null, { detailed : 1 })
-    .then(function (data) {
-      vm.gridOptions.data = data;
-    })
-    .catch(Notify.handleError)
-    .finally(function () {
-      vm.loading = false;
-    });
+      .then((data) => {
+        vm.gridOptions.data = data;
+      })
+      .catch(Notify.handleError)
+      .finally(() => {
+        vm.loading = false;
+      });
   }
 
   // switch to delete warning mode
   function deleteHoliday(title) {
     ModalService.confirm('FORM.DIALOGS.CONFIRM_DELETE')
-    .then(function (bool) {
-      if (!bool) { return; }
+      .then((bool) => {
+        if (!bool) { return; }
 
-      Holidays.delete(title.id)
-      .then(function () {
-        Notify.success('FORM.LABELS.DELETED');
-        loadHolidays();
-      })
-      .catch(Notify.handleError);
-    });
+        Holidays.delete(title.id)
+          .then(() => {
+            Notify.success('FORM.LABELS.DELETED');
+            loadHolidays();
+          })
+          .catch(Notify.handleError);
+      });
   }
 
   // update an existing Holiday
@@ -117,4 +117,5 @@ function HolidayManagementController(Holidays, ModalService, Notify, uiGridConst
   }
 
   loadHolidays();
-}
\ No newline at end of file
+}
+
diff --git a/client/src/modules/holidays/holidays.service.js b/client/src/modules/holidays/holidays.service.js
index 6559234746..f4b9ac5340 100644
--- a/client/src/modules/holidays/holidays.service.js
+++ b/client/src/modules/holidays/holidays.service.js
@@ -1,7 +1,7 @@
 angular.module('bhima.services')
   .service('HolidayService', HolidayService);
 
-HolidayService.$inject = ['PrototypeApiService', '$uibModal'];
+HolidayService.$inject = ['PrototypeApiService'];
 
 /**
  * @class HolidayService
@@ -10,8 +10,7 @@ HolidayService.$inject = ['PrototypeApiService', '$uibModal'];
  * @description
  * Encapsulates common requests to the /holidays/ URL.
  */
-function HolidayService(Api, Modal) {
-  var service = new Api('/holidays/');
+function HolidayService(Api) {
+  return new Api('/holidays/');
+}
 
-  return service;
-}
\ No newline at end of file