diff --git a/hodor/controllers/user.py b/hodor/controllers/user.py
index a8452c123d363d413992977d2a8a4d00c8ff62d0..9437491e09511cbba02d6f9cfd3a66ec71639a19 100644
--- a/hodor/controllers/user.py
+++ b/hodor/controllers/user.py
@@ -87,8 +87,8 @@ def add_new_user():
             abort(500)
         user = User(**newuser)
         user.save()
-    return make_response(jsonify(status=201, msg="User {} successfully added" +
-                                 "to database".format(user.username)), 201)
+    return make_response(jsonify(status=201, msg="User {} successfully added".format(user.username) +
+                                 "to database"), 201)
 
 
 #################################################
@@ -145,6 +145,7 @@ def handle_sql_assertion_error(err):
             errmsg = err.orig.args[0].split('\n')
     except IndexError:
         errmsg = err.orig.args[0]
+        
     return make_response(jsonify(status=400, msg=errmsg), 400)
 
 
diff --git a/hodor/models/challenges.py b/hodor/models/challenges.py
index 9df639f9982b59a0cd936a3ff203defd14d6d5f3..615b5eebb80f02e64424fc714e02d84deb03a7ec 100644
--- a/hodor/models/challenges.py
+++ b/hodor/models/challenges.py
@@ -1,18 +1,17 @@
 # -*- coding: utf-8 -*-
 
 from hodor import db
-from sqlalchemy import inspect
 
 
 class Challenges(db.Model):
     __tablename__= 'challenges'
 
-    #Data variables for each challenge
-    chall_id=db.Column(db.String(32), primary_key=True,unique=True,nullable=False)
+    # Data variables for each challenge
+    id = db.Column(db.String(32), primary_key=True, unique=True, nullable=False)
     name = db.Column(db.String(32), nullable=False)
     points = db.Column(db.Integer, nullable=False)
     description = db.Column(db.String(2048), nullable=False)
-    hints=db.Column(db.String(512), nullable=False)
+    hints = db.Column(db.String(512), nullable=False)
 
     @staticmethod
     def save(self):