diff --git a/src/import/test_import.py b/src/import/test_import.py
index 2e65630..2943e7a 100755
--- a/src/import/test_import.py
+++ b/src/import/test_import.py
@@ -4,7 +4,6 @@
 This is a test import script which imports data from zipped
 Usenet news files.
 """
-from elasticsearch.helpers import BulkIndexError
 
 import os
 import sys
@@ -14,6 +13,7 @@
 import concurrent.futures
 from article import Article
 from elasticsearch import Elasticsearch, helpers
+from elasticsearch.helpers import BulkIndexError
 import yaml
 
 
diff --git a/src/service/app.py b/src/service/app.py
index 54f197e..3e453b1 100644
--- a/src/service/app.py
+++ b/src/service/app.py
@@ -24,6 +24,11 @@
 
 @app.after_request
 def after_request(response):
+    """
+    Add CORS headers.
+    :param response:
+    :return:
+    """
     response.headers["Access-Control-Allow-Origin"] = "*"
     response.headers["Access-Control-Allow-Headers"] = "*"
     response.headers["Access-Control-Allow-Methods"] = "POST, GET, OPTIONS"
diff --git a/src/service/elastic_index.py b/src/service/elastic_index.py
index 6d751a4..9023142 100644
--- a/src/service/elastic_index.py
+++ b/src/service/elastic_index.py
@@ -4,9 +4,9 @@
 Contains methods for finding articles.
 """
 
+import math
 import yaml
 from elasticsearch import Elasticsearch
-import math
 from werkzeug.exceptions import NotFound
 
 
@@ -210,8 +210,8 @@ def get_min_max(self, fields):
         )['aggregations']
 
         for key, value in response.items():
-            type, field = key.split('-')
-            tmp[field][type] = value['value']
+            agg_type, field = key.split('-')
+            tmp[field][agg_type] = value['value']
 
         return tmp
 
@@ -258,7 +258,7 @@ def get_facets(self):
         what facets are available.
         :return:
         """
-        with open("fields.yaml", 'r') as stream:
+        with open("fields.yaml", 'r', encoding='utf-8') as stream:
             data = yaml.safe_load(stream)
         tmp = {}
         number_fields = []