diff --git a/package.json b/package.json
index f3bf88e793..d3f319d570 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "csso": "~1.3.11",
     "dateformat": "~1.0.11",
     "debug": "~2.1.0",
+    "dedent": "^0.4.0",
     "dotenv": "~0.4.0",
     "errorhandler": "~1.3.0",
     "eslint": "^1.1.0",
diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index a13940f794..ae0400d86a 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -1,4 +1,5 @@
 import _ from 'lodash';
+import dedent from 'dedent';
 import moment from 'moment';
 import { Observable, Scheduler } from 'rx';
 import assign from 'object.assign';
@@ -208,10 +209,12 @@ module.exports = function(app) {
           debug('next challengeName', nextChallengeName);
           if (!nextChallengeName || nextChallengeName === firstChallenge) {
             req.flash('errors', {
-              msg: 'Once you have completed all of our challenges, you should '+
-              'join our <a href=\"//gitter.im/freecodecamp/HalfWayClub\"'+
-              'target=\"_blank\">Half Way Club</a> and start getting '+
-              'ready for our nonprofit projects.'
+              msg: dedent`
+                Once you have completed all of our challenges, you should
+                join our <a href=\"//gitter.im/freecodecamp/HalfWayClub\"
+                target=\"_blank\">Half Way Club</a> and start getting
+                ready for our nonprofit projects.
+              `.split('\n').join(' ')
             });
             return res.redirect('/map');
           }
diff --git a/server/boot/middlewares.js b/server/boot/middlewares.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/server/boot/nonprofits.js b/server/boot/nonprofits.js
index f9f811277b..37bb734755 100644
--- a/server/boot/nonprofits.js
+++ b/server/boot/nonprofits.js
@@ -64,21 +64,22 @@ module.exports = function(app) {
           return res.redirect('../nonprofit/' + dashedNameFull);
         }
 
-        //We need to create logic that verifies completion. Defaulting to false for now.
-        //var buttonActive = false;
-        //if (
-        //  req.user &&
-        //  req.user.completedCoursewares.length > 63
-        //) {
-        //  var hasShownInterest =
-        //    nonprofit.interestedCampers.filter(function(user) {
-        //      return user.username === req.user.username;
-        //    });
+        //  We need to create logic that verifies completion.
+        //  Defaulting to false for now.
+        //  var buttonActive = false;
+        //  if (
+        //    req.user &&
+        //    req.user.completedCoursewares.length > 63
+        //  ) {
+        //    var hasShownInterest =
+        //      nonprofit.interestedCampers.filter(function(user) {
+        //        return user.username === req.user.username;
+        //      });
         //
-        //  if (hasShownInterest.length === 0) {
-        //    buttonActive = true;
+        //    if (hasShownInterest.length === 0) {
+        //      buttonActive = true;
+        //    }
         //  }
-        //}
 
         res.render('nonprofits/show', {
           dashedName: dashedNameFull,