diff --git a/clean.py b/clean.py
index 061321d..0db079c 100755
--- a/clean.py
+++ b/clean.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
-from pprint import pprint
-import os
-import redis
-import configparser
 import argparse
+import configparser
+import os
+from pprint import pprint
 
+import redis
 
 RED="\033[91m"
 GREEN="\033[92m"
diff --git a/give_honors_to_org.py b/give_honors_to_org.py
index f154f73..9279e64 100755
--- a/give_honors_to_org.py
+++ b/give_honors_to_org.py
@@ -1,9 +1,13 @@
 #!/usr/bin/env python3.5
 
-import os, sys, json
-import datetime, time
-import redis
 import configparser
+import datetime
+import json
+import os
+import sys
+import time
+
+import redis
 
 import util
 from helpers import contributor_helper
diff --git a/helpers/contributor_helper.py b/helpers/contributor_helper.py
index 671eed3..5dd6abc 100644
--- a/helpers/contributor_helper.py
+++ b/helpers/contributor_helper.py
@@ -1,16 +1,19 @@
-import util
-from util import getZrange
-import math, random
-import time
-import os
 import configparser
-import json
 import datetime
+import json
 import logging
+import math
+import os
+import random
+import time
+
 import redis
 
 import util
+from util import getZrange
+
 from . import users_helper
+
 KEYDAY = "CONTRIB_DAY" # To be used by other module
 KEYALLORG = "CONTRIB_ALL_ORG" # To be used by other module
 
@@ -589,4 +592,3 @@ class Contributor_helper:
                 return { 'remainingPts': i-points, 'stepPts': prev }
             prev = i
         return { 'remainingPts': 0, 'stepPts': self.rankMultiplier**self.levelMax }
-
diff --git a/helpers/geo_helper.py b/helpers/geo_helper.py
index d45e6f3..57a0065 100644
--- a/helpers/geo_helper.py
+++ b/helpers/geo_helper.py
@@ -1,18 +1,21 @@
-import math, random
-import os
+import datetime
 import json
-import datetime, time
 import logging
-import json
-import redis
+import math
+import os
+import random
+import time
 from collections import OrderedDict
 
-import geoip2.database
-import phonenumbers, pycountry
-from phonenumbers import geocoder
+import redis
 
+import geoip2.database
+import phonenumbers
+import pycountry
 import util
 from helpers import live_helper
+from phonenumbers import geocoder
+
 
 class InvalidCoordinate(Exception):
     pass
diff --git a/helpers/live_helper.py b/helpers/live_helper.py
index 985bca8..31af76b 100644
--- a/helpers/live_helper.py
+++ b/helpers/live_helper.py
@@ -1,8 +1,9 @@
-import os
+import datetime
 import json
-import random
-import datetime, time
 import logging
+import os
+import random
+import time
 
 
 class Live_helper:
diff --git a/helpers/trendings_helper.py b/helpers/trendings_helper.py
index 61e1479..e19292c 100644
--- a/helpers/trendings_helper.py
+++ b/helpers/trendings_helper.py
@@ -1,13 +1,16 @@
-import math, random
-import os
-import json
 import copy
-import datetime, time
+import datetime
+import json
 import logging
+import math
+import os
+import random
+import time
 from collections import OrderedDict
 
 import util
 
+
 class Trendings_helper:
     def __init__(self, serv_redis_db, cfg):
         self.serv_redis_db = serv_redis_db
diff --git a/helpers/users_helper.py b/helpers/users_helper.py
index 5fe8b90..f38b1f9 100644
--- a/helpers/users_helper.py
+++ b/helpers/users_helper.py
@@ -1,10 +1,13 @@
-import math, random
-import os
+import datetime
 import json
-import datetime, time
 import logging
+import math
+import os
+import random
+import time
 
 import util
+
 from . import contributor_helper
 
 
@@ -63,11 +66,11 @@ class Users_helper:
                 else:
                     break # timestamps should be sorted, no need to process anymore
         return to_return
-                    
+
 
     # return: All dates for all orgs, if date is not supplied, return for all dates
     def getUserLogins(self, date=None):
-        # get all orgs and retreive their timestamps
+        # get all orgs and retrieve their timestamps
         dates = []
         for org in self.getAllOrg():
             keyname = "{}:{}".format(self.keyOrgLog, org)
@@ -169,7 +172,7 @@ class Users_helper:
         data = [data[6]]+data[:6]
         return data
 
-    # return: a dico of the form {login: [[timestamp, count], ...], contrib: [[timestamp, 1/0], ...]} 
+    # return: a dico of the form {login: [[timestamp, count], ...], contrib: [[timestamp, 1/0], ...]}
     #         either for all orgs or the supplied one
     def getUserLoginsAndContribOvertime(self, date, org=None, prev_days=6):
         dico_hours_contrib = {}
diff --git a/retreive_map_pic.py b/retrieve_map_pic.py
similarity index 98%
rename from retreive_map_pic.py
rename to retrieve_map_pic.py
index 55929a1..e8dd22e 100755
--- a/retreive_map_pic.py
+++ b/retrieve_map_pic.py
@@ -1,13 +1,15 @@
 #!/usr/bin/env python3.5
-import redis
-import requests
-import shutil
 import json
 import math
-import sys, os
+import os
+import shlex
+import shutil
+import sys
 import time
 from subprocess import PIPE, Popen
-import shlex
+
+import redis
+import requests
 
 URL_OPEN_MAP = "http://tile.openstreetmap.org/{zoom}/{x}/{y}.png"
 MAP_DIR = "static/maps/"
diff --git a/server.py b/server.py
index 8a1943f..e7da6a6 100755
--- a/server.py
+++ b/server.py
@@ -1,21 +1,22 @@
 #!/usr/bin/env python3
-from flask import Flask, render_template, request, Response, jsonify, stream_with_context
-import json
-import redis
-import random, math
 import configparser
+import datetime
+import errno
+import json
+import logging
+import math
+import os
+import random
 from time import gmtime as now
 from time import sleep, strftime
-import datetime
-import os
-import logging
+
+import redis
 
 import util
-from helpers import geo_helper
-from helpers import contributor_helper
-from helpers import users_helper
-from helpers import trendings_helper
-from helpers import live_helper
+from flask import (Flask, Response, jsonify, render_template, request,
+                   stream_with_context)
+from helpers import (contributor_helper, geo_helper, live_helper,
+                     trendings_helper, users_helper)
 
 configfile = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'config/config.cfg')
 cfg = configparser.ConfigParser()
@@ -590,4 +591,12 @@ def getGenericTrendingOvertime():
     return jsonify(data)
 
 if __name__ == '__main__':
-    app.run(host=server_host, port=server_port, threaded=True)
+    try:
+        app.run(host=server_host,
+            port=server_port,
+            threaded=True)
+    except OSError as error:
+        if error.errno == 98:
+            print("\n\n\nAddress already in use, the defined port is: " + str(server_port))
+        else:
+            print(str(error))
diff --git a/static/js/trendings.js b/static/js/trendings.js
index d87aeae..b2ea959 100644
--- a/static/js/trendings.js
+++ b/static/js/trendings.js
@@ -145,7 +145,7 @@ function getTextColour(rgb) {
     }
 }
 
-// If json (from tag), only retreive the name> otherwise return the supplied arg.
+// If json (from tag), only retrieve the name> otherwise return the supplied arg.
 function getOnlyName(potentialJson) {
     try {
         jsonLabel = JSON.parse(potentialJson);
diff --git a/tests/test_geo.py b/tests/test_geo.py
index 94b9801..4c75b3d 100755
--- a/tests/test_geo.py
+++ b/tests/test_geo.py
@@ -1,8 +1,13 @@
 #!/usr/bin/env python3.5
 import configparser
-import redis
-import sys,os
 import datetime
+import os
+import sys
+
+import redis
+
+from helpers import geo_helper
+
 sys.path.append('..')
 
 configfile = 'test_config.cfg'
@@ -14,7 +19,6 @@ serv_redis_db = redis.StrictRedis(
         port=6260,
         db=1)
 
-from helpers import geo_helper
 geo_helper = geo_helper.Geo_helper(serv_redis_db, cfg)
 
 categ = 'Network Activity'
diff --git a/tests/test_trendings.py b/tests/test_trendings.py
index 4cce0e7..4716e05 100755
--- a/tests/test_trendings.py
+++ b/tests/test_trendings.py
@@ -1,8 +1,14 @@
 #!/usr/bin/env python3.5
 import configparser
+import datetime
+import os
+import sys
+import time
+
 import redis
-import sys,os
-import datetime, time
+
+from helpers import trendings_helper
+
 sys.path.append('..')
 
 configfile = 'test_config.cfg'
@@ -14,7 +20,6 @@ serv_redis_db = redis.StrictRedis(
         port=6260,
         db=1)
 
-from helpers import trendings_helper
 trendings_helper = trendings_helper.Trendings_helper(serv_redis_db, cfg)
 
 
diff --git a/tests/test_users.py b/tests/test_users.py
index 61e7b41..2eb6f71 100755
--- a/tests/test_users.py
+++ b/tests/test_users.py
@@ -1,8 +1,14 @@
 #!/usr/bin/env python3.5
 import configparser
+import datetime
+import os
+import sys
+import time
+
 import redis
-import sys,os
-import datetime, time
+
+from helpers import users_helper
+
 sys.path.append('..')
 
 configfile = 'test_config.cfg'
@@ -14,7 +20,6 @@ serv_redis_db = redis.StrictRedis(
         port=6260,
         db=1)
 
-from helpers import users_helper
 users_helper = users_helper.Users_helper(serv_redis_db, cfg)
 
 
diff --git a/util.py b/util.py
index 6f6d0db..e61984c 100644
--- a/util.py
+++ b/util.py
@@ -1,5 +1,6 @@
+import datetime
+import time
 from collections import defaultdict
-import datetime, time
 
 ONE_DAY = 60*60*24
 
diff --git a/zmq_dispatcher.py b/zmq_dispatcher.py
index 37a3874..3f94b81 100755
--- a/zmq_dispatcher.py
+++ b/zmq_dispatcher.py
@@ -1,23 +1,22 @@
 #!/usr/bin/env python3
 
-import time, datetime
-import copy
-import logging
-import zmq
-import redis
-import random
-import configparser
 import argparse
-import os
-import sys
+import configparser
+import copy
+import datetime
 import json
+import logging
+import os
+import random
+import sys
+import time
+
+import redis
+import zmq
 
 import util
-from helpers import geo_helper
-from helpers import contributor_helper
-from helpers import users_helper
-from helpers import trendings_helper
-from helpers import live_helper
+from helpers import (contributor_helper, geo_helper, live_helper,
+                     trendings_helper, users_helper)
 
 configfile = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'config/config.cfg')
 cfg = configparser.ConfigParser()
diff --git a/zmq_subscriber.py b/zmq_subscriber.py
index b642333..97b2a71 100755
--- a/zmq_subscriber.py
+++ b/zmq_subscriber.py
@@ -1,14 +1,16 @@
 #!/usr/bin/env python3
 
-import time, datetime
-import zmq
-import logging
-import redis
-import configparser
 import argparse
+import configparser
+import datetime
+import json
+import logging
 import os
 import sys
-import json
+import time
+
+import redis
+import zmq
 
 configfile = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'config/config.cfg')
 cfg = configparser.ConfigParser()