diff --git a/appengine/express/app.yaml b/appengine/express/app.yaml
index 6f48107af0..09725ea77f 100644
--- a/appengine/express/app.yaml
+++ b/appengine/express/app.yaml
@@ -10,9 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
+# [START app_yaml]
 runtime: nodejs
 vm: true
 api_version: 1
 env_variables:
-  PORT: 8080
\ No newline at end of file
+  PORT: 8080
+# [END app_yaml]
\ No newline at end of file
diff --git a/appengine/express/bin/www b/appengine/express/bin/www
index 7aec6f629d..7d9036ee45 100755
--- a/appengine/express/bin/www
+++ b/appengine/express/bin/www
@@ -2,10 +2,11 @@
 
 'use strict';
 
+// [START server]
+
 /**
  * Module dependencies.
  */
-
 var app = require('../app');
 var debug = require('debug')('express:server');
 var http = require('http');
@@ -13,7 +14,6 @@ var http = require('http');
 /**
  * Get port from environment and store in Express.
  */
-
 var port = normalizePort(process.env.PORT || 8080);
 app.set('port', port);
 
@@ -26,15 +26,15 @@ var server = http.createServer(app);
 /**
  * Listen on provided port, on all network interfaces.
  */
-
 server.listen(port);
 server.on('error', onError);
 server.on('listening', onListening);
 
+// [END server]
+
 /**
  * Normalize a port into a number, string, or false.
  */
-
 function normalizePort(val) {
   var port = parseInt(val, 10);
 
@@ -54,7 +54,6 @@ function normalizePort(val) {
 /**
  * Event listener for HTTP server "error" event.
  */
-
 function onError(error) {
   if (error.syscall !== 'listen') {
     throw error;
@@ -82,7 +81,6 @@ function onError(error) {
 /**
  * Event listener for HTTP server "listening" event.
  */
-
 function onListening() {
   var addr = server.address();
   var bind = typeof addr === 'string'
diff --git a/appengine/express/routes/index.js b/appengine/express/routes/index.js
index 6839bf7897..478019c773 100644
--- a/appengine/express/routes/index.js
+++ b/appengine/express/routes/index.js
@@ -16,9 +16,10 @@
 var express = require('express');
 var router = express.Router();
 
-/* GET home page. */
+// [START hello_world]
 router.get('/', function(req, res) {
-  res.render('index', { title: 'Express 4 on Google App Engine' });
+  res.render('index', { title: 'Hello World!' });
 });
+// [END hello_world]
 
 module.exports = router;
diff --git a/appengine/geddy/app.yaml b/appengine/geddy/app.yaml
index 6f48107af0..09725ea77f 100644
--- a/appengine/geddy/app.yaml
+++ b/appengine/geddy/app.yaml
@@ -10,9 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
+# [START app_yaml]
 runtime: nodejs
 vm: true
 api_version: 1
 env_variables:
-  PORT: 8080
\ No newline at end of file
+  PORT: 8080
+# [END app_yaml]
\ No newline at end of file
diff --git a/appengine/geddy/app/controllers/main.js b/appengine/geddy/app/controllers/main.js
index 922390ac09..e9e28652cb 100644
--- a/appengine/geddy/app/controllers/main.js
+++ b/appengine/geddy/app/controllers/main.js
@@ -18,6 +18,7 @@
 
 'use strict';
 
+// [START main]
 var Main = function () {
   this.index = function (req, resp, params) {
     this.respond({params: params}, {
@@ -28,3 +29,4 @@ var Main = function () {
 };
 
 exports.Main = Main;
+// [END main]
\ No newline at end of file
diff --git a/appengine/geddy/server.js b/appengine/geddy/server.js
index 0dc356fab3..65eb88f18b 100644
--- a/appengine/geddy/server.js
+++ b/appengine/geddy/server.js
@@ -13,8 +13,10 @@
 
 'use strict';
 
+// [START server]
 var geddy = require('geddy');
 
 geddy.start({
   port: process.env.PORT || 8080
-});
\ No newline at end of file
+});
+// [END server]
\ No newline at end of file
diff --git a/appengine/grunt/Gruntfile.js b/appengine/grunt/Gruntfile.js
index ec7643938c..e08b05153d 100644
--- a/appengine/grunt/Gruntfile.js
+++ b/appengine/grunt/Gruntfile.js
@@ -16,6 +16,7 @@
 module.exports = function(grunt) {
 
   grunt.initConfig({
+    // [START config]
     jshint: {
       files: ['Gruntfile.js', 'src/**/*.js'],
       options: {
@@ -26,30 +27,34 @@ module.exports = function(grunt) {
       }
     },
     cssmin: {
-    	minify: {
-    		src: 'src/public/stylesheets/style.css',
-    		dest: 'src/public/stylesheets/style.min.css'
-  		}
+      minify: {
+        src: 'src/public/stylesheets/style.css',
+        dest: 'src/public/stylesheets/style.min.css'
+      }
     },
+    // [END config]
     clean: ['src/public/stylesheets/style.min.css'],
     watch: {
       js: {
-      	files: ['<%= jshint.files %>'],
-      	tasks: ['jshint']
+        files: ['<%= jshint.files %>'],
+        tasks: ['jshint']
       },
 
       css: {
-      	files: ['<%= cssmin.minify.src %>'],
-      	tasks: ['cssmin']
+        files: ['<%= cssmin.minify.src %>'],
+        tasks: ['cssmin']
       }
     }
   });
+  grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-contrib-clean');
 
+  // [START tasks]
   grunt.loadNpmTasks('grunt-contrib-jshint');
-  grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-cssmin');
-  grunt.loadNpmTasks('grunt-contrib-clean');
 
   grunt.registerTask('build', ['jshint', 'cssmin']);
+  // [END tasks]
+
   grunt.registerTask('default', ['watch']);
-};
\ No newline at end of file
+};
diff --git a/appengine/grunt/app.yaml b/appengine/grunt/app.yaml
index 6f48107af0..09725ea77f 100644
--- a/appengine/grunt/app.yaml
+++ b/appengine/grunt/app.yaml
@@ -10,9 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
+# [START app_yaml]
 runtime: nodejs
 vm: true
 api_version: 1
 env_variables:
-  PORT: 8080
\ No newline at end of file
+  PORT: 8080
+# [END app_yaml]
\ No newline at end of file
diff --git a/appengine/grunt/src/app.js b/appengine/grunt/src/app.js
index 71aafc79df..f0b53aa705 100644
--- a/appengine/grunt/src/app.js
+++ b/appengine/grunt/src/app.js
@@ -15,7 +15,6 @@
 
 var express = require('express');
 var path = require('path');
-var favicon = require('serve-favicon');
 var logger = require('morgan');
 var cookieParser = require('cookie-parser');
 var bodyParser = require('body-parser');
@@ -29,8 +28,6 @@ var app = express();
 app.set('views', path.join(__dirname, 'views'));
 app.set('view engine', 'jade');
 
-// uncomment after placing your favicon in /public
-//app.use(favicon(__dirname + '/public/favicon.ico'));
 app.use(logger('dev'));
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
@@ -52,7 +49,7 @@ app.use(function(req, res, next) {
 // development error handler
 // will print stacktrace
 if (app.get('env') === 'development') {
-  app.use(function(err, req, res, next) {
+  app.use(function(err, req, res) {
     res.status(err.status || 500);
     res.render('error', {
       message: err.message,
@@ -63,7 +60,7 @@ if (app.get('env') === 'development') {
 
 // production error handler
 // no stacktraces leaked to user
-app.use(function(err, req, res, next) {
+app.use(function(err, req, res) {
   res.status(err.status || 500);
   res.render('error', {
     message: err.message,
diff --git a/appengine/grunt/src/bin/www b/appengine/grunt/src/bin/www
index 18b0a968ef..7d9036ee45 100755
--- a/appengine/grunt/src/bin/www
+++ b/appengine/grunt/src/bin/www
@@ -1,17 +1,19 @@
 #!/usr/bin/env node
 
+'use strict';
+
+// [START server]
+
 /**
  * Module dependencies.
  */
-
 var app = require('../app');
-var debug = require('debug')('src:server');
+var debug = require('debug')('express:server');
 var http = require('http');
 
 /**
  * Get port from environment and store in Express.
  */
-
 var port = normalizePort(process.env.PORT || 8080);
 app.set('port', port);
 
@@ -24,15 +26,15 @@ var server = http.createServer(app);
 /**
  * Listen on provided port, on all network interfaces.
  */
-
 server.listen(port);
 server.on('error', onError);
 server.on('listening', onListening);
 
+// [END server]
+
 /**
  * Normalize a port into a number, string, or false.
  */
-
 function normalizePort(val) {
   var port = parseInt(val, 10);
 
@@ -52,7 +54,6 @@ function normalizePort(val) {
 /**
  * Event listener for HTTP server "error" event.
  */
-
 function onError(error) {
   if (error.syscall !== 'listen') {
     throw error;
@@ -80,7 +81,6 @@ function onError(error) {
 /**
  * Event listener for HTTP server "listening" event.
  */
-
 function onListening() {
   var addr = server.address();
   var bind = typeof addr === 'string'
diff --git a/appengine/grunt/src/routes/index.js b/appengine/grunt/src/routes/index.js
index 6551843133..478019c773 100644
--- a/appengine/grunt/src/routes/index.js
+++ b/appengine/grunt/src/routes/index.js
@@ -16,9 +16,10 @@
 var express = require('express');
 var router = express.Router();
 
-/* GET home page. */
-router.get('/', function(req, res, next) {
-  res.render('index', { title: 'Grunt + Express 4 on Google App Engine' });
+// [START hello_world]
+router.get('/', function(req, res) {
+  res.render('index', { title: 'Hello World!' });
 });
+// [END hello_world]
 
 module.exports = router;
diff --git a/appengine/hapi/app.yaml b/appengine/hapi/app.yaml
index 50683850a1..09725ea77f 100644
--- a/appengine/hapi/app.yaml
+++ b/appengine/hapi/app.yaml
@@ -10,9 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
+# [START app_yaml]
 runtime: nodejs
 vm: true
 api_version: 1
 env_variables:
   PORT: 8080
+# [END app_yaml]
\ No newline at end of file
diff --git a/appengine/hapi/index.js b/appengine/hapi/index.js
index ae0031d8ab..234ce20012 100644
--- a/appengine/hapi/index.js
+++ b/appengine/hapi/index.js
@@ -13,6 +13,7 @@
 
 'use strict';
 
+// [START server]
 var Hapi = require('hapi');
 
 // Create a server with a host and port
@@ -21,8 +22,9 @@ server.connection({
   host: '127.0.0.1', 
   port: process.env.PORT || 8080
 });
+// [END server]
 
-// Add an index route
+// [START index]
 server.route({
   method: 'GET',
   path:'/', 
@@ -30,6 +32,7 @@ server.route({
     reply('hello world');
   }
 });
+// [END index]
 
 // Add another route
 server.route({
@@ -40,7 +43,8 @@ server.route({
   }
 });
 
-// Start the server
+// [START server_start]
 server.start(function () {
   console.log('Server running at:', server.info.uri);
-});
\ No newline at end of file
+});
+// [END server_start]
\ No newline at end of file
diff --git a/appengine/koa/app.js b/appengine/koa/app.js
index 1fb020237b..9c59038c9b 100644
--- a/appengine/koa/app.js
+++ b/appengine/koa/app.js
@@ -13,6 +13,7 @@
 
 'use strict';
 
+// [START server]
 var koa = require('koa');
 var app = koa();
 
@@ -20,4 +21,5 @@ app.use(function *(){
   this.body = 'Hello World';
 });
 
-app.listen(process.env.PORT || 8080);
\ No newline at end of file
+app.listen(process.env.PORT || 8080);
+// [END server]
diff --git a/appengine/koa/app.yaml b/appengine/koa/app.yaml
index 00668a6347..09725ea77f 100644
--- a/appengine/koa/app.yaml
+++ b/appengine/koa/app.yaml
@@ -10,9 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
+# [START app_yaml]
 runtime: nodejs
-api_version: 1
 vm: true
+api_version: 1
 env_variables:
-  PORT: 8080
\ No newline at end of file
+  PORT: 8080
+# [END app_yaml]
\ No newline at end of file
diff --git a/appengine/kraken/README.md b/appengine/kraken/README.md
index 749561b555..c5e38875be 100644
--- a/appengine/kraken/README.md
+++ b/appengine/kraken/README.md
@@ -16,6 +16,7 @@ vm: true
 api_version: 1
 env_variables:
   PORT: 8080
+```
 
 ##### Deploy
 
diff --git a/appengine/kraken/app.yaml b/appengine/kraken/app.yaml
index 6f48107af0..09725ea77f 100644
--- a/appengine/kraken/app.yaml
+++ b/appengine/kraken/app.yaml
@@ -10,9 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
+# [START app_yaml]
 runtime: nodejs
 vm: true
 api_version: 1
 env_variables:
-  PORT: 8080
\ No newline at end of file
+  PORT: 8080
+# [END app_yaml]
\ No newline at end of file
diff --git a/appengine/kraken/controllers/index.js b/appengine/kraken/controllers/index.js
index 77ff58d8a9..2f897d2091 100644
--- a/appengine/kraken/controllers/index.js
+++ b/appengine/kraken/controllers/index.js
@@ -15,17 +15,12 @@
 
 var IndexModel = require('../models/index');
 
-
+// [START index]
 module.exports = function (router) {
+  var model = new IndexModel();
 
-    var model = new IndexModel();
-
-    router.get('/', function (req, res) {
-        
-        
-        res.render('index', model);
-        
-        
-    });
-
+  router.get('/', function (req, res) {
+      res.render('index', model);
+  });
 };
+// [END index]
\ No newline at end of file
diff --git a/appengine/kraken/server.js b/appengine/kraken/server.js
index 0bd1af30b2..7128e6d7ca 100644
--- a/appengine/kraken/server.js
+++ b/appengine/kraken/server.js
@@ -13,6 +13,7 @@
 
 'use strict';
 
+// [START server]
 var app = require('./index');
 var http = require('http');
 
@@ -21,9 +22,9 @@ var server;
 /*
  * Create and start HTTP server.
  */
-
 server = http.createServer(app);
 server.listen(process.env.PORT || 8080);
 server.on('listening', function () {
   console.log('Server listening on http://localhost:%d', this.address().port);
 });
+// [END server]
diff --git a/appengine/loopback/app.yaml b/appengine/loopback/app.yaml
index 6f48107af0..09725ea77f 100644
--- a/appengine/loopback/app.yaml
+++ b/appengine/loopback/app.yaml
@@ -10,9 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
+# [START app_yaml]
 runtime: nodejs
 vm: true
 api_version: 1
 env_variables:
-  PORT: 8080
\ No newline at end of file
+  PORT: 8080
+# [END app_yaml]
\ No newline at end of file
diff --git a/appengine/loopback/server/server.js b/appengine/loopback/server/server.js
index 8dccb75626..04a5fe5be6 100644
--- a/appengine/loopback/server/server.js
+++ b/appengine/loopback/server/server.js
@@ -13,6 +13,7 @@
 
 'use strict';
 
+// [START server]
 var loopback = require('loopback');
 var boot = require('loopback-boot');
 
@@ -29,9 +30,13 @@ app.start = function() {
 // Bootstrap the application, configure models, datasources and middleware.
 // Sub-apps like REST API are mounted via boot scripts.
 boot(app, __dirname, function(err) {
-  if (err) throw err;
+  if (err) {
+    throw err;
+  }
 
   // start the server if `$ node server.js`
-  if (require.main === module)
+  if (require.main === module) {
     app.start();
+  }
 });
+// [START server]
\ No newline at end of file
diff --git a/appengine/redis/app.yaml b/appengine/redis/app.yaml
index 6f48107af0..09725ea77f 100644
--- a/appengine/redis/app.yaml
+++ b/appengine/redis/app.yaml
@@ -10,9 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
+# [START app_yaml]
 runtime: nodejs
 vm: true
 api_version: 1
 env_variables:
-  PORT: 8080
\ No newline at end of file
+  PORT: 8080
+# [END app_yaml]
\ No newline at end of file
diff --git a/appengine/redis/server.js b/appengine/redis/server.js
index 14f096bf7d..e09e375614 100644
--- a/appengine/redis/server.js
+++ b/appengine/redis/server.js
@@ -22,48 +22,47 @@ var nconf = require('nconf');
 // but you can also store them in environment variables
 nconf.argv().env().file('keys.json');
 
+// [START client]
 // Connect to a redis server provisioned over at 
-// redisLabs.  See the README for more info. 
+// Redis Labs.  See the README for more info. 
 var client = redis.createClient(
-    nconf.get('redisPort') || '6379',
-    nconf.get('redisHost') || '127.0.0.1', 
-    {
-        auth_pass: nconf.get('redisKey'), // jshint ignore:line
-        return_buffers: true // jshint ignore:line
-    }
+  nconf.get('redisPort') || '6379',
+  nconf.get('redisHost') || '127.0.0.1', 
+  {
+    auth_pass: nconf.get('redisKey'), // jshint ignore:line
+    return_buffers: true // jshint ignore:line
+  }
 ).on('error', function (err) {
-    console.error('ERR:REDIS: ' + err);
-});    
+  console.error('ERR:REDIS: ' + err);
+});
+// [END client]
 
 // Create a simple little server. 
 http.createServer(function (req, res) {
-    
-    client.on('error', function (err) {
-        console.log('Error ' + err);
-    });
-
-    // Track every IP that has visited this site
-    var listName = 'IPs';
-    client.lpush(listName, req.connection.remoteAddress);
-    client.ltrim(listName, 0, 25);
+  client.on('error', function (err) {
+    console.log('Error ' + err);
+  });
 
-    // push out a range 
-    var iplist = '';
-    client.lrange(listName, 0, -1, function (err, data) {
-        if (err) {
-            console.log(err);
-        }
-        console.log('listing data...\n');
-        data.forEach(function (ip) {
+  // Track every IP that has visited this site
+  var listName = 'IPs';
+  client.lpush(listName, req.connection.remoteAddress);
+  client.ltrim(listName, 0, 25);
 
-            console.log('IP: ' + ip + '\n');
-            iplist += ip + '; ';
-        });
-        
-        res.writeHead(200, {'Content-Type': 'text/plain'});
-        res.end(iplist);
+  // push out a range 
+  var iplist = '';
+  client.lrange(listName, 0, -1, function (err, data) {
+    if (err) {
+      console.log(err);
+    }
+    console.log('listing data...\n');
+    data.forEach(function (ip) {
+      console.log('IP: ' + ip + '\n');
+      iplist += ip + '; ';
     });
-
+    
+    res.writeHead(200, {'Content-Type': 'text/plain'});
+    res.end(iplist);
+  });
 }).listen(process.env.PORT || 8080);
 
 console.log('started web process');
\ No newline at end of file
diff --git a/appengine/restify/app.yaml b/appengine/restify/app.yaml
index 6f48107af0..09725ea77f 100644
--- a/appengine/restify/app.yaml
+++ b/appengine/restify/app.yaml
@@ -10,9 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
+# [START app_yaml]
 runtime: nodejs
 vm: true
 api_version: 1
 env_variables:
-  PORT: 8080
\ No newline at end of file
+  PORT: 8080
+# [END app_yaml]
\ No newline at end of file
diff --git a/appengine/restify/server.js b/appengine/restify/server.js
index 9efcb78ba0..1a1f6db3e5 100644
--- a/appengine/restify/server.js
+++ b/appengine/restify/server.js
@@ -13,12 +13,14 @@
 
 'use strict';
 
+// [START server]
 var restify = require('restify');
 
 var server = restify.createServer({
   name: 'appengine-restify',
   version: '1.0.0'
 });
+// [END server]
 
 server.use(restify.acceptParser(server.acceptable));
 server.use(restify.queryParser());
@@ -29,10 +31,14 @@ server.get('/echo/:name', function (req, res, next) {
   return next();
 });
 
+// [START index]
 server.get('/', function (req, res) {
-	res.send('restify on appengine');
+  res.send('Hello World!');
 });
+// [END index]
 
+// [START server_start]
 server.listen(process.env.PORT || 8080, function () {
   console.log('%s listening at %s', server.name, server.url);
-});
\ No newline at end of file
+});
+// [END server_start]
\ No newline at end of file
diff --git a/appengine/sails/README.md b/appengine/sails/README.md
index f798ce35f4..b65e0d23cd 100644
--- a/appengine/sails/README.md
+++ b/appengine/sails/README.md
@@ -16,6 +16,7 @@ vm: true
 api_version: 1
 env_variables:
   PORT: 8080
+```
 
 ##### Deploy
 
diff --git a/appengine/sails/app.js b/appengine/sails/app.js
index 2dd736c84d..f2ddaad730 100644
--- a/appengine/sails/app.js
+++ b/appengine/sails/app.js
@@ -13,6 +13,7 @@
 
 'use strict';
 
+// [START server]
 /**
  * app.js
  *
@@ -72,3 +73,4 @@ process.chdir(__dirname);
   // Start server
   sails.lift(rc('sails'));
 })();
+// [END server]
diff --git a/appengine/sails/app.yaml b/appengine/sails/app.yaml
index 6f48107af0..09725ea77f 100644
--- a/appengine/sails/app.yaml
+++ b/appengine/sails/app.yaml
@@ -10,9 +10,11 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
+#
+# [START app_yaml]
 runtime: nodejs
 vm: true
 api_version: 1
 env_variables:
-  PORT: 8080
\ No newline at end of file
+  PORT: 8080
+# [END app_yaml]
\ No newline at end of file