diff --git a/Makefile b/Makefile
index ba0ede459..a79ea97e3 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ test:
 lint:
 	$(ESLINT) ./*.js
 	$(ESLINT) ./dev-server/*.js
-	$(ESLINT) ./bin/**.js
+	$(ESLINT) ./bin/**/*.js
 	$(ESLINT) ./src/*.js
 	$(ESLINT) ./src/mixins/*.jsx
 	$(ESLINT) ./src/views/**/*.jsx
diff --git a/bin/configure-fastly.js b/bin/configure-fastly.js
index 5b53d1255..fb180e2b0 100644
--- a/bin/configure-fastly.js
+++ b/bin/configure-fastly.js
@@ -59,6 +59,13 @@ var pathsToCondition = function (paths) {
     }, '');
 };
 
+/*
+ * Helper method to NOT a condition statement
+ */
+var negateConditionStatement = function (statement) {
+    return '!(' + statement + ')';
+};
+
 /*
  * Combine static paths, routes, and any additional paths to a single
  * fastly condition to match req.url
@@ -114,7 +121,7 @@ async.auto({
     passRequestCondition: ['version', 'notPassRequestCondition', function (cb, results) {
         var condition = {
             name: PASS_REQUEST_CONDITION_NAME,
-            statement: fastly.negateConditionStatement(results.notPassRequestCondition.statement),
+            statement: negateConditionStatement(results.notPassRequestCondition.statement),
             type: 'REQUEST',
             priority: 10
         };
diff --git a/bin/lib/fastly-extended.js b/bin/lib/fastly-extended.js
index 6d9c680f5..fa1f373e8 100644
--- a/bin/lib/fastly-extended.js
+++ b/bin/lib/fastly-extended.js
@@ -11,21 +11,9 @@ module.exports = function (apiKey, serviceId) {
     var fastly = Fastly(apiKey);
     fastly.serviceId = serviceId;
 
-    /*
-     * Helper method to NOT a condition statement
-     * 
-     * @param {string} Statement
-     *
-     * @return {string}
-     */
-    fastly.negateConditionStatement = function (statement) {
-        return '!(' + statement + ')';
-    };
-
-
     /*
      * Helper method for constructing Fastly API urls
-     * 
+     *
      * @param {string} Service id
      * @param {number} Version
      *
@@ -37,19 +25,17 @@ module.exports = function (apiKey, serviceId) {
 
     /*
      * getLatestVersion: Get the most recent version for the configured service
-     * 
+     *
      * @param {callback} Callback with signature *err, latestVersion)
      */
     fastly.getLatestVersion = function (cb) {
         if (!this.serviceId) {
-            console.error('Failed to get latest version.');
-            return cb('No serviceId configured');
+            return cb('Failed to get latest version. No serviceId configured');
         }
         var url = '/service/'+ encodeURIComponent(this.serviceId) +'/version';
         this.request('GET', url, function (err, versions) {
             if (err) {
-                console.error('Failed to get versions', err);
-                return cb(err);
+                return cb('Failed to fetch versions: ' + err);
             }
             var latestVersion = versions.reduce(function (latestVersion, version) {
                 if (!latestVersion) return version;
@@ -57,21 +43,20 @@ module.exports = function (apiKey, serviceId) {
                 return latestVersion;
             });
             return cb(null, latestVersion);
-        });    
+        });
     };
 
     /*
      * setCondition: Upsert a Fastly condition entry
      * Attempts to PUT and POSTs if the PUT request is a 404
-     * 
+     *
      * @param {number} Version number
      * @param {object} Condition object sent to the API
      * @param {callback} Callback for fastly.request
      */
     fastly.setCondition = function (version, condition, cb) {
         if (!this.serviceId) {
-            console.error('Failed to set condition', condition);
-            return cb('No serviceId configured');
+            return cb('Failed to set condition. No serviceId configured');
         }
         var name = condition.name;
         var putUrl = this.getFastlyAPIPrefix(this.serviceId, version) + '/condition/' + encodeURIComponent(name);
@@ -80,16 +65,14 @@ module.exports = function (apiKey, serviceId) {
             if (err && err.statusCode === 404) {
                 this.request('POST', postUrl, condition, function (err, response) {
                     if (err) {
-                        console.log('Failed to POST header', header);
-                        return cb(err);
+                        return cb('Failed while inserting condition: ' + err);
                     }
                     return cb(null, response);
                 });
                 return;
             }
             if (err) {
-                console.error('Failed to PUT condition', condition);
-                return cb(err);
+                return cb('Failed to update condition: ' + err);
             }
             return cb(null, response);
         }.bind(this));
@@ -98,15 +81,14 @@ module.exports = function (apiKey, serviceId) {
     /*
      * setFastlyHeader: Upsert a Fastly header entry
      * Attempts to PUT and POSTs if the PUT request is a 404
-     * 
+     *
      * @param {number} Version number
      * @param {object} Header object sent to the API
      * @param {callback} Callback for fastly.request
      */
     fastly.setFastlyHeader = function (version, header, cb) {
         if (!this.serviceId) {
-            console.error('Failed to set header', header);
-            cb('No serviceId configured');
+            cb('Failed to set header. No serviceId configured');
         }
         var name = header.name;
         var putUrl = this.getFastlyAPIPrefix(this.serviceId, version) + '/header/' + encodeURIComponent(name);
@@ -115,16 +97,14 @@ module.exports = function (apiKey, serviceId) {
             if (err && err.statusCode === 404) {
                 this.request('POST', postUrl, header, function (err, response) {
                     if (err) {
-                        console.error('Failed to POST header', header);
-                        return cb(err);
+                        return cb('Failed to insert header: ' + err);
                     }
                     return cb(null, response);
                 });
                 return;
             }
             if (err) {
-                console.error('Failed to PUT header', header);
-                return cb(err);
+                return cb('Failed to update header: ' + err);
             }
             return cb(null, response);
         }.bind(this));
diff --git a/bin/lib/locale-compare.js b/bin/lib/locale-compare.js
index 96f9f24df..b20a08d6e 100644
--- a/bin/lib/locale-compare.js
+++ b/bin/lib/locale-compare.js
@@ -38,8 +38,8 @@ Helpers.mergeNewTranslations = function (existingTranslations, newTranslations,
     }
 
     //Fill in defaults
-    for (var id in icuTemplate) {
-        if (!existingTranslations.hasOwnProperty(id)) existingTranslations[id] = icuTemplate[id];
+    for (var icuId in icuTemplate) {
+        if (!existingTranslations.hasOwnProperty(icuId)) existingTranslations[icuId] = icuTemplate[icuId];
     }
     return existingTranslations;
 };