diff --git a/package.json b/package.json
index e32a9af765..f2bb074ff4 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "test:watch": "karma start --no-single-run --auto-watch",
     "webdriver:start": "node node_modules/protractor/bin/webdriver-manager start --seleniumPort 4444",
     "webdriver:update": "node node_modules/protractor/bin/webdriver-manager update --standalone",
-    "lint": "tslint \"src/**/*.ts\" || true && tslint \"e2e/**/*.ts\" || true",
+    "lint": "tslint \"src/**/*.ts\" && tslint \"e2e/**/*.ts\"",
     "docs": "typedoc --options typedoc.json ./src/",
     "coverage": "http-server -c-1 -o -p 9875 ./coverage"
   },
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts b/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index 08ee0fd840..bf069eee60 100644
--- a/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
+++ b/src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
@@ -41,7 +41,7 @@ describe('SearchFacetFilterComponent', () => {
     }
   ];
   let filterService;
-  let page = Observable.of(0)
+  const page = Observable.of(0)
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule],
@@ -147,8 +147,8 @@ describe('SearchFacetFilterComponent', () => {
 
     it('should return the correct number of items shown (this equals the page count x page size)', () => {
       const sub = count.subscribe((c) => {
-        const subsub = comp.currentPage.subscribe((page) => {
-          expect(c).toBe(page * mockFilterConfig.pageSize);
+        const subsub = comp.currentPage.subscribe((currentPage) => {
+          expect(c).toBe(currentPage * mockFilterConfig.pageSize);
         });
         subsub.unsubscribe()
       });
@@ -188,4 +188,4 @@ describe('SearchFacetFilterComponent', () => {
       expect(filterService.getPage).toHaveBeenCalledWith(mockFilterConfig.name)
     });
   });
-});
\ No newline at end of file
+});
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.spec.ts b/src/app/+search-page/search-filters/search-filter/search-filter.component.spec.ts
index 62cfb23970..78d40b1cf6 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.component.spec.ts
+++ b/src/app/+search-page/search-filters/search-filter/search-filter.component.spec.ts
@@ -166,6 +166,4 @@ describe('SearchFilterComponent', () => {
       sub.unsubscribe();
     });
   });
-
-
 });
diff --git a/src/app/+search-page/search-page.component.spec.ts b/src/app/+search-page/search-page.component.spec.ts
index 31878ceb21..d72610695d 100644
--- a/src/app/+search-page/search-page.component.spec.ts
+++ b/src/app/+search-page/search-page.component.spec.ts
@@ -109,10 +109,10 @@ describe('SearchPageComponent', () => {
   });
 
   describe('when update search results is called', () => {
-    let pagination;
-    let sort;
+    let paginationUpdate;
+    let sortUpdate;
     beforeEach(() => {
-      pagination = Object.assign(
+      paginationUpdate = Object.assign(
         {},
         new PaginationComponentOptions(),
         {
@@ -120,7 +120,7 @@ describe('SearchPageComponent', () => {
           pageSize: 15
         }
       );
-      sort = Object.assign({},
+      sortUpdate = Object.assign({},
         new SortOptions(),
         {
           direction: SortDirection.Ascending,
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.ts b/src/app/+search-page/search-sidebar/search-sidebar.component.ts
index beec358a6c..946048462a 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.component.ts
+++ b/src/app/+search-page/search-sidebar/search-sidebar.component.ts
@@ -15,6 +15,4 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 export class SearchSidebarComponent {
   @Input() resultCount;
   @Output() toggleSidebar = new EventEmitter<boolean>();
-  constructor() {
-  }
 }
diff --git a/src/app/header/header.component.spec.ts b/src/app/header/header.component.spec.ts
index 61ec8e2a0d..7c1a9601ac 100644
--- a/src/app/header/header.component.spec.ts
+++ b/src/app/header/header.component.spec.ts
@@ -10,7 +10,6 @@ import { HeaderComponent } from './header.component';
 import { HeaderState } from './header.reducer';
 import { HeaderToggleAction } from './header.actions';
 
-
 let comp: HeaderComponent;
 let fixture: ComponentFixture<HeaderComponent>;
 let store: Store<HeaderState>;
diff --git a/src/app/shared/route.service.ts b/src/app/shared/route.service.ts
index b11da41211..f24fa0d00d 100644
--- a/src/app/shared/route.service.ts
+++ b/src/app/shared/route.service.ts
@@ -18,7 +18,7 @@ export class RouteService {
   }
 
   hasQueryParam(paramName: string): Observable<boolean> {
-    return this.route.queryParamMap.map((map) => {return map.has(paramName);});
+    return this.route.queryParamMap.map((map) => map.has(paramName));
   }
 
   hasQueryParamWithValue(paramName: string, paramValue: string): Observable<boolean> {