diff --git a/app/__init__.py b/app/__init__.py
index 26088cbf..70c1deb7 100644
--- a/app/__init__.py
+++ b/app/__init__.py
@@ -1,7 +1,7 @@
 from flask import Flask
 from flask_cors import CORS
 
-#see PEP396
+# See PEP396.
 __version__ = '2.0'
 
 def create_app():
@@ -19,9 +19,10 @@ def create_app():
     with app.app_context():
         # Import routes.
         from . import routes
-        #register api endpoints
-        app.register_blueprint(routes.rest_api_v1)
-        app.register_blueprint(routes.rest_api_v2)
+
+        # Register api endpoints.
+        app.register_blueprint(routes.api_v1)
+        app.register_blueprint(routes.api_v2)
 
         # Return created app.
         return app
diff --git a/app/routes/__init__.py b/app/routes/__init__.py
index 1a016284..e57a75ea 100644
--- a/app/routes/__init__.py
+++ b/app/routes/__init__.py
@@ -1,9 +1,8 @@
-from flask import redirect, current_app as app
+from flask import Blueprint, redirect, current_app as app
 
-#follow the import order to avoid circular dependency
-from flask import Blueprint
-rest_api_v1 = Blueprint("rest_api_v1", __name__, url_prefix="")
-rest_api_v2 = Blueprint("rest_api_v2", __name__, url_prefix="/v2")
+# Follow the import order to avoid circular dependency
+api_v1 = Blueprint('api_v1', __name__, url_prefix='')
+api_v2 = Blueprint('api_v2', __name__, url_prefix='/v2')
 
 # API version 2.
 from .v2 import locations, latest
diff --git a/app/routes/v1/all.py b/app/routes/v1/all.py
index 6c0472ef..57c95ebb 100644
--- a/app/routes/v1/all.py
+++ b/app/routes/v1/all.py
@@ -1,9 +1,9 @@
 from flask import jsonify
 from flask import current_app as app
+from ...routes import api_v1 as api
 from ...services.location.jhu import get_category
-from ...routes import rest_api_v1
 
-@rest_api_v1.route('/all')
+@api.route('/all')
 def all():
     # Get all the categories.
     confirmed = get_category('confirmed')
diff --git a/app/routes/v1/confirmed.py b/app/routes/v1/confirmed.py
index d1489fd7..42cc5cac 100644
--- a/app/routes/v1/confirmed.py
+++ b/app/routes/v1/confirmed.py
@@ -1,8 +1,8 @@
 from flask import jsonify
 from flask import current_app as app
+from ...routes import api_v1 as api
 from ...services.location.jhu import get_category
-from ...routes import rest_api_v1
 
-@rest_api_v1.route('/confirmed')
+@api.route('/confirmed')
 def confirmed():
     return jsonify(get_category('confirmed'))
diff --git a/app/routes/v1/deaths.py b/app/routes/v1/deaths.py
index 6b398ebc..9d876c74 100644
--- a/app/routes/v1/deaths.py
+++ b/app/routes/v1/deaths.py
@@ -1,8 +1,8 @@
 from flask import jsonify
 from flask import current_app as app
+from ...routes import api_v1 as api
 from ...services.location.jhu import get_category
-from ...routes import rest_api_v1
 
-@rest_api_v1.route('/deaths')
+@api.route('/deaths')
 def deaths():
     return jsonify(get_category('deaths'))
diff --git a/app/routes/v1/recovered.py b/app/routes/v1/recovered.py
index aad645b0..d7b8b6d0 100644
--- a/app/routes/v1/recovered.py
+++ b/app/routes/v1/recovered.py
@@ -1,8 +1,8 @@
 from flask import jsonify
 from flask import current_app as app
+from ...routes import api_v1 as api
 from ...services.location.jhu import get_category
-from ...routes import rest_api_v1
 
-@rest_api_v1.route('/recovered')
+@api.route('/recovered')
 def recovered():
     return jsonify(get_category('recovered'))
diff --git a/app/routes/v2/latest.py b/app/routes/v2/latest.py
index b8c487db..a7656ae8 100644
--- a/app/routes/v2/latest.py
+++ b/app/routes/v2/latest.py
@@ -1,8 +1,8 @@
 from flask import jsonify, current_app as app
+from ...routes import api_v2 as api
 from ...services import jhu
-from ...routes import rest_api_v2
 
-@rest_api_v2.route('/latest')
+@api.route('/latest')
 def latest():
     # Get the serialized version of all the locations.
     locations = [ location.serialize() for location in jhu.get_all() ]
diff --git a/app/routes/v2/locations.py b/app/routes/v2/locations.py
index 2e448d54..6131934d 100644
--- a/app/routes/v2/locations.py
+++ b/app/routes/v2/locations.py
@@ -1,9 +1,9 @@
 from distutils.util import strtobool
 from flask import jsonify, request, current_app as app
+from ...routes import api_v2 as api
 from ...services import jhu
-from ...routes import rest_api_v2
 
-@rest_api_v2.route('/locations')
+@api.route('/locations')
 def locations():
     # Query parameters.
     timelines    = strtobool(request.args.get('timelines', default='0'))
@@ -23,7 +23,7 @@ def locations():
         ]
     })
 
-@rest_api_v2.route('/locations/<int:id>')
+@api.route('/locations/<int:id>')
 def location(id):
     # Query parameters.
     timelines = strtobool(request.args.get('timelines', default='1'))