diff --git a/app/models.py b/app/models.py
index deeea003..e5c29953 100644
--- a/app/models.py
+++ b/app/models.py
@@ -28,6 +28,7 @@ class Role(db.Model):
     __tablename__ = 'roles'
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
+    # Fields
     default = db.Column(db.Boolean, default=False, index=True)
     name = db.Column(db.String(64), unique=True)
     permissions = db.Column(db.Integer)
@@ -103,12 +104,14 @@ class User(UserMixin, db.Model):
     __tablename__ = 'users'
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
+    # Fields
     confirmed = db.Column(db.Boolean, default=False)
     email = db.Column(db.String(254), unique=True, index=True)
     password_hash = db.Column(db.String(128))
     registration_date = db.Column(db.DateTime(), default=datetime.utcnow)
     role_id = db.Column(db.Integer, db.ForeignKey('roles.id'))
     username = db.Column(db.String(64), unique=True, index=True)
+    # Setting Fields
     setting_dark_mode = db.Column(db.Boolean, default=False)
     # Relationships
     corpora = db.relationship('Corpus', backref='creator', lazy='dynamic',
@@ -233,6 +236,7 @@ class JobInput(db.Model):
     __tablename__ = 'job_inputs'
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
+    # Fields
     filename = db.Column(db.String(255))
     dir = db.Column(db.String(255))
     job_id = db.Column(db.Integer, db.ForeignKey('jobs.id'))
@@ -256,6 +260,7 @@ class JobResult(db.Model):
     __tablename__ = 'job_results'
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
+    # Fields
     filename = db.Column(db.String(255))
     dir = db.Column(db.String(255))
     job_id = db.Column(db.Integer, db.ForeignKey('jobs.id'))
@@ -279,6 +284,7 @@ class Job(db.Model):
     __tablename__ = 'jobs'
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
+    # Fields
     creation_date = db.Column(db.DateTime(), default=datetime.utcnow)
     description = db.Column(db.String(255))
     end_date = db.Column(db.DateTime())
@@ -349,6 +355,7 @@ class CorpusFile(db.Model):
     __tablename__ = 'corpus_files'
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
+    # Fields
     address = db.Column(db.String(255))
     author = db.Column(db.String(255))
     booktitle = db.Column(db.String(255))
@@ -395,6 +402,7 @@ class Corpus(db.Model):
     __tablename__ = 'corpora'
     # Primary key
     id = db.Column(db.Integer, primary_key=True)
+    # Fields
     creation_date = db.Column(db.DateTime(), default=datetime.utcnow)
     description = db.Column(db.String(255))
     status = db.Column(db.String(16))