diff --git a/app.js b/app.js
index 6d9900cdd5..e28db26c64 100644
--- a/app.js
+++ b/app.js
@@ -49,7 +49,7 @@ var app = express();
 
 mongoose.connect(secrets.db);
 mongoose.connection.on('error', function() {
-  console.error('MongoDB Connection Error. Make sure MongoDB is running.');
+  console.error('MongoDB Connection Error. Please make sure that MongoDB is running.');
 });
 
 /**
diff --git a/models/User.js b/models/User.js
index d881ed860d..71862eb3b5 100644
--- a/models/User.js
+++ b/models/User.js
@@ -1,6 +1,6 @@
-var mongoose = require('mongoose');
 var bcrypt = require('bcrypt-nodejs');
 var crypto = require('crypto');
+var mongoose = require('mongoose');
 
 var userSchema = new mongoose.Schema({
   email: { type: String, unique: true, lowercase: true },
@@ -27,20 +27,19 @@ var userSchema = new mongoose.Schema({
 });
 
 /**
- * Hash the password for security.
- * "Pre" is a Mongoose middleware that executes before each user.save() call.
+ * Password hashing Mongoose middleware.
  */
 
 userSchema.pre('save', function(next) {
   var user = this;
 
-  if (!user.isModified('password')) return next();
+  if (!user.isModified('password')) { return next(); }
 
   bcrypt.genSalt(5, function(err, salt) {
-    if (err) return next(err);
+    if (err) { return next(err); }
 
     bcrypt.hash(user.password, salt, null, function(err, hash) {
-      if (err) return next(err);
+      if (err) { return next(err); }
       user.password = hash;
       next();
     });
@@ -48,24 +47,22 @@ userSchema.pre('save', function(next) {
 });
 
 /**
- * Validate user's password.
- * Used by Passport-Local Strategy for password validation.
+ * Helper method for validationg user's password.
  */
 
 userSchema.methods.comparePassword = function(candidatePassword, cb) {
   bcrypt.compare(candidatePassword, this.password, function(err, isMatch) {
-    if (err) return cb(err);
+    if (err) { return cb(err); }
     cb(null, isMatch);
   });
 };
 
 /**
- * Get URL to a user's gravatar.
- * Used in Navbar and Account Management page.
+ * Helper method for getting user's gravatar.
  */
 
 userSchema.methods.gravatar = function(size) {
-  if (!size) size = 200;
+  if (!size) { size = 200; }
 
   if (!this.email) {
     return 'https://gravatar.com/avatar/?s=' + size + '&d=retro';