From ba5d1d00b486899a0f799eb261ee983bd8c09261 Mon Sep 17 00:00:00 2001
From: Joe Catera <zhouyaoji@yahoo.com>
Date: Thu, 18 Oct 2012 00:13:46 -0700
Subject: [PATCH] Fixed JSLint errors.

---
 .../part1/hello/application.json              |  1 -
 .../mojits/HelloMojit/controller.server.js    |  5 ++-
 .../part2/basic_yql/application.json          |  3 --
 .../part2/basic_yql/index.js                  |  8 ++--
 .../mojits/Flickr/controller.server.js        |  9 ++--
 .../mojits/Flickr/models/model.server.js      | 29 ++++++-------
 .../part2/basic_yql/routes.json               | 10 ++---
 .../part3/intl-templates/application.json     |  2 -
 .../part3/intl-templates/index.js             |  6 +--
 .../mojits/Flickr/controller.server.js        | 23 +++++-----
 .../mojits/Flickr/lang/Flickr.js              |  4 +-
 .../mojits/Flickr/lang/Flickr_de.js           |  3 +-
 .../mojits/Flickr/models/model.server.js      | 24 +++++------
 .../part3/intl-templates/routes.json          |  3 +-
 .../part3/intl-templates/server.js            |  4 +-
 .../part4/paged-yql/application.json          |  1 -
 .../part4/paged-yql/index.js                  |  6 +--
 .../mojits/PagedFlickr/binders/index.js       | 42 ++++++++-----------
 .../mojits/PagedFlickr/controller.common.js   | 32 +++++++-------
 .../mojits/PagedFlickr/lang/PagedFlickr_de.js |  5 +--
 .../PagedFlickr/lang/PagedFlickr_en-US.js     |  5 +--
 .../mojits/PagedFlickr/models/model.common.js | 32 +++++++-------
 .../part4/paged-yql/routes.json               |  3 --
 .../part4/paged-yql/server.js                 |  3 +-
 .../part5/flickr-list/application.json        |  2 -
 .../part5/flickr-list/models/flickr.common.js | 40 +++++++++---------
 .../mojits/FlickrBrowser/assets/logmutator.js |  3 +-
 .../mojits/FlickrBrowser/binders/index.js     | 10 ++---
 .../mojits/FlickrBrowser/controller.common.js |  6 ++-
 .../mojits/FlickrDetail/binders/index.js      | 20 ++++-----
 .../mojits/FlickrDetail/binders/message.js    |  4 +-
 .../mojits/FlickrDetail/controller.common.js  | 12 +++---
 .../FlickrDetail/lang/FlickrDetail_de.js      |  3 +-
 .../FlickrDetail/lang/FlickrDetail_en-US.js   |  4 +-
 .../mojits/PagedFlickr/binders/index.js       | 20 ++++-----
 .../mojits/PagedFlickr/controller.common.js   | 38 +++++++++--------
 .../mojits/PagedFlickr/lang/PagedFlickr_de.js |  4 +-
 .../PagedFlickr/lang/PagedFlickr_en-US.js     |  4 +-
 .../part5/flickr-list/routes.json             |  3 --
 39 files changed, 209 insertions(+), 227 deletions(-)

diff --git a/examples/getting-started-guide/part1/hello/application.json b/examples/getting-started-guide/part1/hello/application.json
index d927c148f..7917a43d8 100644
--- a/examples/getting-started-guide/part1/hello/application.json
+++ b/examples/getting-started-guide/part1/hello/application.json
@@ -1,7 +1,6 @@
 [
     {
         "settings": [ "master" ],
-
         "specs": {
             "hello": {
                 "type": "HelloMojit"
diff --git a/examples/getting-started-guide/part1/hello/mojits/HelloMojit/controller.server.js b/examples/getting-started-guide/part1/hello/mojits/HelloMojit/controller.server.js
index 70987547d..c5ffa2076 100644
--- a/examples/getting-started-guide/part1/hello/mojits/HelloMojit/controller.server.js
+++ b/examples/getting-started-guide/part1/hello/mojits/HelloMojit/controller.server.js
@@ -4,8 +4,9 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('HelloMojit', function(Y, NAME) {
+YUI.add('HelloMojit', function (Y, NAME) {
 
+    "use strict";
 /**
  * The HelloMojit module.
  *
@@ -26,7 +27,7 @@ YUI.add('HelloMojit', function(Y, NAME) {
          * @param ac {Object} The action context that provides access
          *        to the Mojito API.
          */
-        index: function(ac) {
+        index: function (ac) {
             ac.done('Mojito is working.');
         }
 
diff --git a/examples/getting-started-guide/part2/basic_yql/application.json b/examples/getting-started-guide/part2/basic_yql/application.json
index ef6620822..35320ebf1 100644
--- a/examples/getting-started-guide/part2/basic_yql/application.json
+++ b/examples/getting-started-guide/part2/basic_yql/application.json
@@ -1,13 +1,10 @@
 [
     {
-
         "settings" : ["master"],
-
         "specs": {
             "flickr": {
                 "type": "Flickr"
             }
         }
-
     }
 ]
diff --git a/examples/getting-started-guide/part2/basic_yql/index.js b/examples/getting-started-guide/part2/basic_yql/index.js
index e13db6ce2..a80baf402 100644
--- a/examples/getting-started-guide/part2/basic_yql/index.js
+++ b/examples/getting-started-guide/part2/basic_yql/index.js
@@ -16,13 +16,13 @@ process.chdir(__dirname);
  * @param {object} token Token used to identify the application.
  */
 module.exports = function(config, token) {
-    var server = require('./server.js');
-    var YUI = require('mojito').YUI;
+    var server = require('./server.js'),
+        YUI = require('mojito').YUI;
 
-    YUI().use('mojito-server', function(Y) {
+    YUI().use('mojito-server', function (Y) {
         var app = server(Y);
 
         // Signal the app is ready, providing the token and app references.
         process.emit("application-ready", token, app);
-    });    
+    });
 };
diff --git a/examples/getting-started-guide/part2/basic_yql/mojits/Flickr/controller.server.js b/examples/getting-started-guide/part2/basic_yql/mojits/Flickr/controller.server.js
index 95a09c34f..bdd719970 100644
--- a/examples/getting-started-guide/part2/basic_yql/mojits/Flickr/controller.server.js
+++ b/examples/getting-started-guide/part2/basic_yql/mojits/Flickr/controller.server.js
@@ -4,8 +4,9 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('Flickr', function(Y, NAME) {
+YUI.add('Flickr', function (Y, NAME) {
 
+    "use strict";
 /**
  * The Flickr module.
  *
@@ -21,8 +22,8 @@ YUI.add('Flickr', function(Y, NAME) {
          *        to the Mojito API.
          * @return {}       
          */
-        index: function(ac) {
-            ac.models.flickr.getFlickrImages('mojito', function(images) {
+        index: function (ac) {
+            ac.models.FlickrModel.getFlickrImages('mojito', function (images) {
 
                 ac.flush({images: images});
 
@@ -32,4 +33,4 @@ YUI.add('Flickr', function(Y, NAME) {
 
     };
 
-}, '0.0.1', {requires: []});
+}, '0.0.1', {requires: ['FlickrModel']});
diff --git a/examples/getting-started-guide/part2/basic_yql/mojits/Flickr/models/model.server.js b/examples/getting-started-guide/part2/basic_yql/mojits/Flickr/models/model.server.js
index 629feebbe..f1482b1e9 100644
--- a/examples/getting-started-guide/part2/basic_yql/mojits/Flickr/models/model.server.js
+++ b/examples/getting-started-guide/part2/basic_yql/mojits/Flickr/models/model.server.js
@@ -4,7 +4,10 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('FlickrModel', function(Y) {
+/*jslint plusplus:true */
+YUI.add('FlickrModel', function (Y, NAME) {
+    "use strict";
+
     var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e';
 
 /**
@@ -12,8 +15,12 @@ YUI.add('FlickrModel', function(Y) {
  *
  * @module FlickrModel
  */
-
-    Y.mojito.models.flickr = {
+    function buildFlickrUrlFromRecord(record) {
+        return 'http://farm' + record.farm
+            + '.static.flickr.com/' + record.server
+            + '/' + record.id + '_' + record.secret + '.jpg';
+    }
+    Y.namespace('mojito.models')[NAME] = {
 
         /**
          * Method that will be invoked by the mojit controller to obtain data.
@@ -22,17 +29,17 @@ YUI.add('FlickrModel', function(Y) {
          *        data has been retrieved.
          * @return {Object} photots
          */
-        getFlickrImages: function(queryString, callback) {
+        getFlickrImages: function (queryString, callback) {
             var q = 'select * from flickr.photos.search where text="' + queryString + '" and api_key="' + API_KEY + '"';
-            Y.YQL(q, function(rawYqlData) {
+            Y.YQL(q, function (rawYqlData) {
                 Y.log(rawYqlData);
                 var rawPhotos = rawYqlData.query.results.photo,
-                    rawPhoto = null
+                    rawPhoto = null,
                     photos = [],
                     photo = null,
                     i = 0;
 
-                for (; i<rawPhotos.length; i++) {
+                for (i = 0; i < rawPhotos.length; i++) {
                     rawPhoto = rawPhotos[i];
                     photo = {
                         title: rawPhoto.title,
@@ -53,11 +60,5 @@ YUI.add('FlickrModel', function(Y) {
 
     };
 
-    function buildFlickrUrlFromRecord(record) {
-        return 'http://farm' + record.farm 
-            + '.static.flickr.com/' + record.server 
-            + '/' + record.id + '_' + record.secret + '.jpg';
-    }
-
-// TODO: remove 'jsonp-url' requirement when YUI fix for bug http://yuilibrary.com/projects/yui3/ticket/2530251 is deployed.
+ // TODO: remove 'jsonp-url' requirement when YUI fix for bug http://yuilibrary.com/projects/yui3/ticket/2530251 is deployed.
 }, '0.0.1', {requires: ['mojito', 'yql', 'jsonp-url']});
diff --git a/examples/getting-started-guide/part2/basic_yql/routes.json b/examples/getting-started-guide/part2/basic_yql/routes.json
index dd127b4c3..4cf122944 100644
--- a/examples/getting-started-guide/part2/basic_yql/routes.json
+++ b/examples/getting-started-guide/part2/basic_yql/routes.json
@@ -1,22 +1,20 @@
-[{
+[
+  {
     "settings": [ "master" ],
-
     "route one": {
         "verbs": [ "get" ],
         "path": "/flickr",
         "call": "flickr.index"
     },
-
     "route two": {
         "verbs": [ "get" ],
         "path": "/booyah",
         "call": "flickr.index"
     },
-
     "route three": {
         "verbs": [ "get" ],
         "path": "/pineapples",
         "call": "flickr.index"
     }
-
-}]
+  }
+]
diff --git a/examples/getting-started-guide/part3/intl-templates/application.json b/examples/getting-started-guide/part3/intl-templates/application.json
index b07b6bcb1..7888067c1 100644
--- a/examples/getting-started-guide/part3/intl-templates/application.json
+++ b/examples/getting-started-guide/part3/intl-templates/application.json
@@ -1,12 +1,10 @@
 [
     {
         "settings": [ "master" ],
-    
         "specs": {
             "flickr" : {
                 "type": "Flickr"
             }
         }
-    
     }
 ]
diff --git a/examples/getting-started-guide/part3/intl-templates/index.js b/examples/getting-started-guide/part3/intl-templates/index.js
index e13db6ce2..bb41ae0d3 100644
--- a/examples/getting-started-guide/part3/intl-templates/index.js
+++ b/examples/getting-started-guide/part3/intl-templates/index.js
@@ -16,13 +16,13 @@ process.chdir(__dirname);
  * @param {object} token Token used to identify the application.
  */
 module.exports = function(config, token) {
-    var server = require('./server.js');
-    var YUI = require('mojito').YUI;
+    var server = require('./server.js'),
+        YUI = require('mojito').YUI;
 
     YUI().use('mojito-server', function(Y) {
         var app = server(Y);
 
         // Signal the app is ready, providing the token and app references.
         process.emit("application-ready", token, app);
-    });    
+    });
 };
diff --git a/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/controller.server.js b/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/controller.server.js
index 83c01d39e..79dbc9f5e 100644
--- a/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/controller.server.js
+++ b/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/controller.server.js
@@ -4,8 +4,9 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('Flickr', function(Y, NAME) {
+YUI.add('Flickr', function (Y, NAME) {
 
+    "use strict";
 /**
  * The Flickr module.
  *
@@ -20,19 +21,19 @@ YUI.add('Flickr', function(Y, NAME) {
          * @param ac {Object} The action context that provides access
          *        to the Mojito API.
          */
-        index: function(ac) {
-            ac.models.flickr.getFlickrImages('mojito', function(images) {
-                var dateString = ac.intl.formatDate(new Date());
-                var data = {
-                    images: images,
-                    date: dateString,
-                    greeting: ac.intl.lang("TITLE"),
-                    url: ac.url.make('flickr','index')
-                };
+        index: function (ac) {
+            ac.models.FlickrModel.getFlickrImages('mojito', function (images) {
+                var dateString = ac.intl.formatDate(new Date()),
+                    data = {
+                        images: images,
+                        date: dateString,
+                        greeting: ac.intl.lang("TITLE"),
+                        url: ac.url.make('flickr', 'index')
+                    };
                 ac.done(data);
             });
         }
 
     };
 
-}, '0.0.1', {requires: ['mojito-intl-addon']});
+}, '0.0.1', {requires: ['mojito-intl-addon', 'FlickrModel']});
diff --git a/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/lang/Flickr.js b/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/lang/Flickr.js
index 63c8b3c57..3f29f1186 100644
--- a/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/lang/Flickr.js
+++ b/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/lang/Flickr.js
@@ -4,8 +4,8 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add("lang/Flickr", function(Y) {
-
+YUI.add("lang/Flickr", function (Y) {
+    "use strict";
     Y.Intl.add(
 
         "Flickr",   // associated module
diff --git a/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/lang/Flickr_de.js b/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/lang/Flickr_de.js
index f502b3ca7..f281808c3 100644
--- a/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/lang/Flickr_de.js
+++ b/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/lang/Flickr_de.js
@@ -4,8 +4,9 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add("lang/Flickr_de", function(Y) {
+YUI.add("lang/Flickr_de", function (Y) {
 
+    "use strict";
     Y.Intl.add(
 
         "Flickr",   // associated module
diff --git a/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/models/model.server.js b/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/models/model.server.js
index 9f69d8eb3..9b5330dd0 100644
--- a/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/models/model.server.js
+++ b/examples/getting-started-guide/part3/intl-templates/mojits/Flickr/models/model.server.js
@@ -4,26 +4,31 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('FlickrModel', function(Y) {
+/*jslint plusplus: true */
+YUI.add('FlickrModel', function (Y, NAME) {
+    "use strict";
     var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e';
-
 /**
  * The FlickrModel module.
  *
  * @module FlickrModel
  */
+    function buildFlickrUrlFromRecord(record) {
+        return 'http://farm' + record.farm
+            + '.static.flickr.com/' + record.server
+            + '/' + record.id + '_' + record.secret + '.jpg';
+    }
 
-    Y.mojito.models.flickr = {
-
+    Y.namespace('mojito.models')[NAME] = {
         /**
          * Method that will be invoked by the mojit controller to obtain data.
          *
          * @param callback {Function} The callback function to call when the
          *        data has been retrieved.
          */
-        getFlickrImages: function(queryString, callback) {
+        getFlickrImages: function (queryString, callback) {
             var q = 'select * from flickr.photos.search where text="' + queryString + '" and api_key="' + API_KEY + '"';
-            Y.YQL(q, function(rawYqlData) {
+            Y.YQL(q, function (rawYqlData) {
                 Y.log(rawYqlData);
                 var rawPhotos = rawYqlData.query.results.photo,
                     rawPhoto = null,
@@ -31,7 +36,7 @@ YUI.add('FlickrModel', function(Y) {
                     photo = null,
                     i = 0;
 
-                for (; i<rawPhotos.length; i++) {
+                for (i = 0; i < rawPhotos.length; i++) {
                     rawPhoto = rawPhotos[i];
                     photo = {
                         title: rawPhoto.title,
@@ -52,11 +57,6 @@ YUI.add('FlickrModel', function(Y) {
 
     };
 
-    function buildFlickrUrlFromRecord(record) {
-        return 'http://farm' + record.farm 
-            + '.static.flickr.com/' + record.server 
-            + '/' + record.id + '_' + record.secret + '.jpg';
-    }
 
 // TODO: remove 'jsonp-url' requirement when YUI fix for bug http://yuilibrary.com/projects/yui3/ticket/2530251 is deployed.
 }, '0.0.1', {requires: ['mojito', 'yql', 'jsonp-url']});
diff --git a/examples/getting-started-guide/part3/intl-templates/routes.json b/examples/getting-started-guide/part3/intl-templates/routes.json
index 3bd58d9f6..16d015b50 100644
--- a/examples/getting-started-guide/part3/intl-templates/routes.json
+++ b/examples/getting-started-guide/part3/intl-templates/routes.json
@@ -1,11 +1,10 @@
 [
     {
         "settings": [ "master" ],
-        
         "root": {
             "verbs": ["get"],
             "path": "/flickr",
             "call": "flickr.index"
         }
     }
-]
\ No newline at end of file
+]
diff --git a/examples/getting-started-guide/part3/intl-templates/server.js b/examples/getting-started-guide/part3/intl-templates/server.js
index 85da9394f..118f4f5a0 100644
--- a/examples/getting-started-guide/part3/intl-templates/server.js
+++ b/examples/getting-started-guide/part3/intl-templates/server.js
@@ -3,5 +3,5 @@
  * Copyrights licensed under the New BSD License.
  * See the accompanying LICENSE file for terms.
  */
-
-module.exports = require('mojito').createServer({dir:__dirname});
+/*jslint nomen: true */
+module.exports = require('mojito').createServer({dir: __dirname});
diff --git a/examples/getting-started-guide/part4/paged-yql/application.json b/examples/getting-started-guide/part4/paged-yql/application.json
index b58ffbdcc..0402637c4 100644
--- a/examples/getting-started-guide/part4/paged-yql/application.json
+++ b/examples/getting-started-guide/part4/paged-yql/application.json
@@ -1,7 +1,6 @@
 [
     {
         "settings": [ "master" ],
-    
         "specs": {
             "flickr": {
                 "type": "HTMLFrameMojit",
diff --git a/examples/getting-started-guide/part4/paged-yql/index.js b/examples/getting-started-guide/part4/paged-yql/index.js
index e13db6ce2..bb41ae0d3 100644
--- a/examples/getting-started-guide/part4/paged-yql/index.js
+++ b/examples/getting-started-guide/part4/paged-yql/index.js
@@ -16,13 +16,13 @@ process.chdir(__dirname);
  * @param {object} token Token used to identify the application.
  */
 module.exports = function(config, token) {
-    var server = require('./server.js');
-    var YUI = require('mojito').YUI;
+    var server = require('./server.js'),
+        YUI = require('mojito').YUI;
 
     YUI().use('mojito-server', function(Y) {
         var app = server(Y);
 
         // Signal the app is ready, providing the token and app references.
         process.emit("application-ready", token, app);
-    });    
+    });
 };
diff --git a/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/binders/index.js b/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/binders/index.js
index fb0b366d9..2944e6f18 100644
--- a/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/binders/index.js
+++ b/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/binders/index.js
@@ -4,39 +4,33 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('PagedFlickrBinderIndex', function(Y, NAME) {
+YUI.add('PagedFlickrBinderIndex', function (Y, NAME) {
 
+    "use strict";
     function getPage(href) {
-        return href.split('/').pop().split('=').pop()
+        return href.split('/').pop().split('=').pop();
     }
-
     Y.namespace('mojito.binders')[NAME] = {
 
-        init: function(mojitProxy) {
+        init: function (mojitProxy) {
             this.mojitProxy = mojitProxy;
         },
-
-        bind: function(node) {
-            var self = this;
+        bind: function (node) {
             this.node = node;
-            var paginator = function(evt) {
-
-                var tgt = evt.target;
-                var page = getPage(tgt.get('href'));
-
-                evt.halt();
-
-                self.mojitProxy.refreshView({
-                    rpc: true,
-                    params: {
-                        route: {page: page}
-                    }
-                });
-                
-            };
+            var self = this,
+                paginator = function (evt) {
+                    var tgt = evt.target,
+                        page = getPage(tgt.get('href'));
+
+                    evt.halt();
+                    self.mojitProxy.refreshView({
+                        rpc: true,
+                        params: {
+                            route: {page: page}
+                        }
+                    });
+                };
             this.node.all('#paginate a').on('click', paginator, this);
         }
-        
     };
-
 }, '0.0.1', {requires: []});
diff --git a/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/controller.common.js b/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/controller.common.js
index d4fa47fd2..1f191812c 100644
--- a/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/controller.common.js
+++ b/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/controller.common.js
@@ -4,13 +4,21 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('PagedFlickr', function(Y, NAME) {
+YUI.add('PagedFlickr', function (Y, NAME) {
 
+    "use strict";
     var PAGESIZE = 9;
+    function selfUrl(ac, page) {
+        // No real link for pages before page 1
+        if (page < 1) { return '#'; }
+        var params = ac.params.url();
+        params.page = page; // provide the page we want to createa  URL to
+        return ac.url.make('flickr', 'index', Y.QueryString.stringify(params));
+    }
 
     Y.namespace('mojito.controllers')[NAME] = {
 
-        index: function(ac) {
+        index: function (ac) {
             var page = ac.params.merged('page'),
                 start;
 
@@ -22,9 +30,9 @@ YUI.add('PagedFlickr', function(Y, NAME) {
 
             // The "page" parameter is base-1, but the model's "start"
             // parameter is base-0.
-            start = (page-1) * PAGESIZE;
+            start = (page - 1) * PAGESIZE;
 
-            ac.models.flickr.getFlickrImages('mojito', start, PAGESIZE, function(err, images) {
+            ac.models.PagedFlickrModel.getFlickrImages('mojito', start, PAGESIZE, function (err, images) {
 
                 var dateString, data;
 
@@ -39,30 +47,18 @@ YUI.add('PagedFlickr', function(Y, NAME) {
                     date: dateString,
                     greeting: ac.intl.lang("TITLE") || 'title',
                     prev: {
-                        url: selfUrl(ac, page-1 ),
+                        url: selfUrl(ac, page - 1),
                         title: ac.intl.lang("PREV") || 'prev'
                     },
                     next: {
-                        url: selfUrl(ac, page+1),
+                        url: selfUrl(ac, page + 1),
                         title: ac.intl.lang("NEXT") || 'next'
                     }
                 };
-
                 ac.done(data);
-                
             });
         }
     };
-    
-   function selfUrl(ac, page) {
-       // No real link for pages before page 1
-       if (page < 1) { return '#'; }
-       var params = ac.params.url();
-       params.page = page; // provide the page we want to createa  URL to
-       return ac.url.make('flickr', 'index', Y.QueryString.stringify(params));
-    }
-
-
 }, '0.0.1', {requires: [
     'mojito-intl-addon', 'mojito-util', 'PagedFlickrModel'
 ], lang: ['de', 'en-US']});
diff --git a/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/lang/PagedFlickr_de.js b/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/lang/PagedFlickr_de.js
index 5d8715d01..dabfdf561 100644
--- a/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/lang/PagedFlickr_de.js
+++ b/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/lang/PagedFlickr_de.js
@@ -4,10 +4,9 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add("lang/PagedFlickr_de", function(Y) {
-
+YUI.add("lang/PagedFlickr_de", function (Y) {
+    "use strict";
     Y.Intl.add(
-
         "PagedFlickr",  // associated module
         "de",           // BCP 47 language tag
 
diff --git a/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/lang/PagedFlickr_en-US.js b/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/lang/PagedFlickr_en-US.js
index d24120bb8..8da5d3195 100644
--- a/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/lang/PagedFlickr_en-US.js
+++ b/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/lang/PagedFlickr_en-US.js
@@ -4,10 +4,9 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add("lang/PagedFlickr_en-US", function(Y) {
-
+YUI.add("lang/PagedFlickr_en-US", function (Y) {
+    "use strict";
     Y.Intl.add(
-
         "PagedFlickr",  // associated module
         "en-US",           // BCP 47 language tag
 
diff --git a/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/models/model.common.js b/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/models/model.common.js
index f6d2ad805..6fe1b4b9c 100644
--- a/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/models/model.common.js
+++ b/examples/getting-started-guide/part4/paged-yql/mojits/PagedFlickr/models/model.common.js
@@ -3,21 +3,26 @@
  * Copyrights licensed under the New BSD License.
  * See the accompanying LICENSE file for terms.
  */
-
-YUI.add('PagedFlickrModel', function(Y) {
+/*jslint plusplus: true */
+YUI.add('PagedFlickrModel', function (Y, NAME) {
+    "use strict";
     var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e';
+    function buildFlickrUrlFromRecord(record) {
+        return 'http://farm' + record.farm
+            + '.static.flickr.com/' + record.server
+            + '/' + record.id + '_' + record.secret + '.jpg';
+    }
 
-    Y.mojito.models.flickr = {
-
-        getFlickrImages: function(queryString, start, count, callback) {
+    Y.namespace('mojito.models')[NAME] = {
+        getFlickrImages: function (queryString, start, count, callback) {
             var q;
-            start = parseInt(start) || 0;
-            count = parseInt(count) || 10;
+            start = parseInt(start, 10) || 0;
+            count = parseInt(count, 10) || 10;
             // The YQL docs say that the second number is the end, but in practice
             // it appears to be the count.
             // http://developer.yahoo.com/yql/guide/paging.html#remote_limits
             q = 'select * from flickr.photos.search(' + start + ',' + count + ') where text="' + queryString + '" and api_key="' + API_KEY + '"';
-            Y.YQL(q, function(rawYqlData) {
+            Y.YQL(q, function (rawYqlData) {
                 Y.log(rawYqlData);
                 if (!rawYqlData.query.results) {
                     callback("No YQL results!");
@@ -31,8 +36,7 @@ YUI.add('PagedFlickrModel', function(Y) {
 
                 // Sometimes YQL returns more than the requested amount.
                 rawPhotos.splice(count);
-
-                for (; i<rawPhotos.length; i++) {
+                for (i = 0; i < rawPhotos.length; i++) {
                     rawPhoto = rawPhotos[i];
                     photo = {
                         title: rawPhoto.title,
@@ -49,14 +53,6 @@ YUI.add('PagedFlickrModel', function(Y) {
                 callback(null, photos);
             });
         }
-
     };
-
-    function buildFlickrUrlFromRecord(record) {
-        return 'http://farm' + record.farm 
-            + '.static.flickr.com/' + record.server 
-            + '/' + record.id + '_' + record.secret + '.jpg';
-    }
-
 // TODO: remove 'jsonp-url' requirement when YUI fix for bug http://yuilibrary.com/projects/yui3/ticket/2530251 is deployed.
 }, '0.0.1', {requires: ['yql', 'jsonp-url']});
diff --git a/examples/getting-started-guide/part4/paged-yql/routes.json b/examples/getting-started-guide/part4/paged-yql/routes.json
index c5e63bd94..6456209a9 100644
--- a/examples/getting-started-guide/part4/paged-yql/routes.json
+++ b/examples/getting-started-guide/part4/paged-yql/routes.json
@@ -1,18 +1,15 @@
 [
     {
         "settings": [ "master" ],
-
         "flickr_by_page": {
             "verbs": ["get"],
             "path": "/flickr/page/:page",
             "call": "flickr.index"
         },
-
         "flickr_base": {
             "verbs": ["get"],
             "path": "/flickr",
             "call": "flickr.index"
         }
-
     }
 ]
diff --git a/examples/getting-started-guide/part4/paged-yql/server.js b/examples/getting-started-guide/part4/paged-yql/server.js
index 85da9394f..91c03f145 100644
--- a/examples/getting-started-guide/part4/paged-yql/server.js
+++ b/examples/getting-started-guide/part4/paged-yql/server.js
@@ -3,5 +3,6 @@
  * Copyrights licensed under the New BSD License.
  * See the accompanying LICENSE file for terms.
  */
+/*jslint nomen: true */
 
-module.exports = require('mojito').createServer({dir:__dirname});
+module.exports = require('mojito').createServer({dir: __dirname});
diff --git a/examples/getting-started-guide/part5/flickr-list/application.json b/examples/getting-started-guide/part5/flickr-list/application.json
index a1666d1b7..2f09ec575 100644
--- a/examples/getting-started-guide/part5/flickr-list/application.json
+++ b/examples/getting-started-guide/part5/flickr-list/application.json
@@ -1,7 +1,6 @@
 [
     {
         "settings": [ "master" ],
-
         "log": {
             "client": {
                 "level": "warn",
@@ -12,7 +11,6 @@
                 "yui": false
             }
         },
-
         "specs": {
             "flickr": {
                 "type": "HTMLFrameMojit",
diff --git a/examples/getting-started-guide/part5/flickr-list/models/flickr.common.js b/examples/getting-started-guide/part5/flickr-list/models/flickr.common.js
index 1d5874119..bdfe20fdb 100644
--- a/examples/getting-started-guide/part5/flickr-list/models/flickr.common.js
+++ b/examples/getting-started-guide/part5/flickr-list/models/flickr.common.js
@@ -3,32 +3,37 @@
  * Copyrights licensed under the New BSD License.
  * See the accompanying LICENSE file for terms.
  */
-
-YUI.add('ModelFlickr', function(Y, NAME) {
+/*jslint plusplus: true */
+YUI.add('ModelFlickr', function (Y, NAME) {
+    "use strict";
     var API_KEY = '84921e87fb8f2fc338c3ff9bf51a412e';
+    function buildFlickrUrlFromRecord(record) {
+        return 'http://farm' + record.farm
+                + '.static.flickr.com/' + record.server
+                + '/' + record.id + '_' + record.secret + '.jpg';
+    }
 
-    Y.mojito.models.flickr = {
-
-        getFlickrImages: function(queryString, start, count, callback) {
+    Y.namespace('mojito.models')[NAME] = {
+        getFlickrImages: function (queryString, start, count, callback) {
             var q;
-            start = parseInt(start) || 0;
-            count = parseInt(count) || 10;
+            start = parseInt(start, 10) || 0;
+            count = parseInt(count, 10) || 10;
             // The YQL docs say that the second number is the end, but in practice
             // it appears to be the count.
             // http://developer.yahoo.com/yql/guide/paging.html#remote_limits
             q = 'select * from flickr.photos.search(' + start + ',' + count + ') where text="' + queryString + '" and api_key="' + API_KEY + '"';
-            Y.YQL(q, function(rawYqlData) {
+            Y.YQL(q, function (rawYqlData) {
                 if (!rawYqlData || !rawYqlData.query || !rawYqlData.query.results) {
                     callback(rawYqlData);
                     return;
                 }
                 var rawPhotos = rawYqlData.query.results.photo,
-                rawPhoto = null,
-                photos = [],
-                photo = null,
-                i = 0;
+                    rawPhoto = null,
+                    photos = [],
+                    photo = null,
+                    i = 0;
 
-                for (; i < rawPhotos.length; i++) {
+                for (i = 0; i < rawPhotos.length; i++) {
                     rawPhoto = rawPhotos[i];
                     photo = {
                         id: rawPhoto.id,
@@ -45,9 +50,9 @@ YUI.add('ModelFlickr', function(Y, NAME) {
             });
         },
 
-        getFlickrDetail: function(imageId, callback) {
+        getFlickrDetail: function (imageId, callback) {
             var q = 'select * from flickr.photos.info where photo_id="' + imageId + '" and api_key="' + API_KEY + '"';
-            Y.YQL(q, function(rawYqlData) {
+            Y.YQL(q, function (rawYqlData) {
                 if (!rawYqlData || !rawYqlData.query || !rawYqlData.query.results) {
                     callback("BAD YQL!");
                     return;
@@ -63,11 +68,6 @@ YUI.add('ModelFlickr', function(Y, NAME) {
 
     };
 
-    function buildFlickrUrlFromRecord(record) {
-        return 'http://farm' + record.farm
-                + '.static.flickr.com/' + record.server
-                + '/' + record.id + '_' + record.secret + '.jpg';
-    }
 
 // TODO: remove 'jsonp-url' requirement when YUI fix for bug http://yuilibrary.com/projects/yui3/ticket/2530251 is deployed.
 }, '0.0.1', {requires: ['yql', 'jsonp-url']});
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/assets/logmutator.js b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/assets/logmutator.js
index 5f6f7583e..5ec1c22de 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/assets/logmutator.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/assets/logmutator.js
@@ -4,8 +4,9 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('flickr-logger-mutator', function(Y) {
+YUI.add('flickr-logger-mutator', function (Y) {
 
+    "use strict";
     /*
      * Providing a custom log formatter function
      */
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/binders/index.js b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/binders/index.js
index 5b4638cf8..9fbef3a23 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/binders/index.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/binders/index.js
@@ -4,8 +4,8 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('FlickrBrowserBinderIndex', function(Y, NAME) {
-
+YUI.add('FlickrBrowserBinderIndex', function (Y, NAME) {
+    "use strict";
 /**
  * The FlickrBrowserBinderIndex module.
  *
@@ -28,9 +28,9 @@ YUI.add('FlickrBrowserBinderIndex', function(Y, NAME) {
          * Binder initialization method, invoked after all binders on the page
          * have been constructed.
          */
-        init: function(mojitProxy) {
+        init: function (mojitProxy) {
             this.mojitProxy = mojitProxy;
-            this.mojitProxy.listen('flickr-image-chosen', function(event) {
+            this.mojitProxy.listen('flickr-image-chosen', function (event) {
                 Y.log('on flickr-image-chosen ' + event.data.id, 'debug', NAME);
                 // Turn the event generated by PagedFlickr into something
                 // understood by FlickrDetail.
@@ -44,7 +44,7 @@ YUI.add('FlickrBrowserBinderIndex', function(Y, NAME) {
          *
          * @param node {Node} The DOM node to which this mojit is attached.
          */
-        bind: function(node) {}
+        bind: function (node) {}
 
     };
 
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/controller.common.js b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/controller.common.js
index 35f9aa680..b2032a75a 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/controller.common.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrBrowser/controller.common.js
@@ -4,7 +4,9 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('FlickrBrowser', function(Y, NAME) {
+YUI.add('FlickrBrowser', function (Y, NAME) {
+
+    "use strict";
 
 /**
  * The FlickrBrowser module.
@@ -26,7 +28,7 @@ YUI.add('FlickrBrowser', function(Y, NAME) {
          * @param ac {Object} The action context that provides access
          *        to the Mojito API.
          */
-        index: function(ac) {
+        index: function (ac) {
             ac.composite.done();
         }
 
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/binders/index.js b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/binders/index.js
index 62ff40f28..0a748b13b 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/binders/index.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/binders/index.js
@@ -4,14 +4,14 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('FlickrDetailBinderIndex', function(Y, NAME) {
+YUI.add('FlickrDetailBinderIndex', function (Y, NAME) {
 
 /**
  * The FlickrDetailBinder module.
  *
  * @module FlickrDetailBinder
  */
-
+    "use strict";
     /**
      * Constructor for the Binder class.
      *
@@ -21,22 +21,22 @@ YUI.add('FlickrDetailBinderIndex', function(Y, NAME) {
      * @class Binder
      * @constructor
      */
-    
+
     Y.namespace('mojito.binders')[NAME] = {
 
         /**
          * Binder initialization method, invoked after all binders on the page
          * have been constructed.
          */
-        init: function(mojitProxy) {
+        init: function (mojitProxy) {
             var self = this;
             this.mojitProxy = mojitProxy;
-            this.mojitProxy.listen('flickr-image-detail', function(payload) {
+            this.mojitProxy.listen('flickr-image-detail', function (payload) {
                 Y.log('on flickr-image-detail ' + payload.data.id, 'debug', NAME);
-                var urlParams = Y.mojito.util.copy(mojitProxy.context);
-                var routeParams = {
-                    image: payload.data.id
-                };
+                var urlParams = Y.mojito.util.copy(mojitProxy.context),
+                    routeParams = {
+                        image: payload.data.id
+                    };
                 mojitProxy.refreshView({
                     params: {
                         url: urlParams,
@@ -52,7 +52,7 @@ YUI.add('FlickrDetailBinderIndex', function(Y, NAME) {
          *
          * @param node {Node} The DOM node to which this mojit is attached.
          */
-        bind: function(node) {
+        bind: function (node) {
             this.node = node;
         }
 
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/binders/message.js b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/binders/message.js
index 52b0068da..58b47d577 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/binders/message.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/binders/message.js
@@ -4,8 +4,8 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('FlickrDetailBinderMessage', function(Y, NAME) {
-
+YUI.add('FlickrDetailBinderMessage', function (Y, NAME) {
+    "use strict";
     /**
      * The FlickrDetailBinderMessage module.
      *
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/controller.common.js b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/controller.common.js
index 1cc5424e9..6ddb510d0 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/controller.common.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/controller.common.js
@@ -4,28 +4,30 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('FlickrDetail', function(Y, NAME) {
+YUI.add('FlickrDetail', function (Y, NAME) {
+
+    "use strict";
 
     Y.namespace('mojito.controllers')[NAME] = {
 
-        index: function(ac) {
+        index: function (ac) {
 
             var image = ac.params.merged('image') || '0';
 
             // a little paranoia about inputs
             if (!image.match(/^\d+$/)) {
                 ac.assets.addCss('./message.css');
-                ac.done({ type: 'error', message: ac.intl.lang('ERROR_BAD_IMAGE_ID') }, { view: { name:'message' } });
+                ac.done({ type: 'error', message: ac.intl.lang('ERROR_BAD_IMAGE_ID') }, { view: { name: 'message' } });
                 return;
             }
 
             if ('0' === image) {
                 ac.assets.addCss('./message.css');
-                ac.done({ type: 'info', message: ac.intl.lang('INFO_NO_IMAGE_CHOSEN') }, { view: { name:'message' } });
+                ac.done({ type: 'info', message: ac.intl.lang('INFO_NO_IMAGE_CHOSEN') }, { view: { name: 'message' } });
                 return;
             }
 
-            ac.models.flickr.getFlickrDetail(image, function(err, details) {
+            ac.models.ModelFlickr.getFlickrDetail(image, function (err, details) {
                 if (err) {
                     ac.error(new Error("YQL Error"));
                     return;
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/lang/FlickrDetail_de.js b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/lang/FlickrDetail_de.js
index 97b22593f..6c633e959 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/lang/FlickrDetail_de.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/lang/FlickrDetail_de.js
@@ -4,8 +4,9 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add("lang/FlickrDetail_de", function(Y) {
+YUI.add("lang/FlickrDetail_de", function (Y) {
 
+    "use strict";
     Y.Intl.add(
 
         "FlickrDetail", // associated module
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/lang/FlickrDetail_en-US.js b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/lang/FlickrDetail_en-US.js
index 670db6ab7..d45c4f0d0 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/lang/FlickrDetail_en-US.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/FlickrDetail/lang/FlickrDetail_en-US.js
@@ -4,8 +4,8 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add("lang/FlickrDetail_en-US", function(Y) {
-
+YUI.add("lang/FlickrDetail_en-US", function (Y) {
+    "use strict";
     Y.Intl.add(
 
         "FlickrDetail", // associated module
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/binders/index.js b/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/binders/index.js
index d1b32821a..ad830eb6f 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/binders/index.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/binders/index.js
@@ -4,7 +4,7 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('PagedFlickrBinderIndex', function(Y, NAME) {
+YUI.add('PagedFlickrBinderIndex', function (Y, NAME) {
 
 /**
  * The PagedFlickrBinder module.
@@ -21,14 +21,14 @@ YUI.add('PagedFlickrBinderIndex', function(Y, NAME) {
      * @class Binder
      * @constructor
      */
-    
+    "use strict";
     Y.namespace('mojito.binders')[NAME] = {
 
         /**
          * Binder initialization method, invoked after all binders on the page
          * have been constructed.
          */
-        init: function(mojitProxy) {
+        init: function (mojitProxy) {
             this.mojitProxy = mojitProxy;
         },
 
@@ -38,20 +38,20 @@ YUI.add('PagedFlickrBinderIndex', function(Y, NAME) {
          *
          * @param node {Node} The DOM node to which this mojit is attached.
          */
-        bind: function(node) {
-            node.all('.pic a').on('click', function(evt) {
-                var url = evt.currentTarget.get('href');
+        bind: function (node) {
+            node.all('.pic a').on('click', function (evt) {
+                var url = evt.currentTarget.get('href'),
+                    matches = url.match(/image\/(\d+)/),
+                    imageID = matches[1];
                 Y.log('on click ' + url, 'debug', NAME);
-                var matches = url.match(/image\/(\d+)/);
-                var imageID = matches[1];
                 if (imageID) {
                     evt.halt();
 
                     // Update our pagination links so when we round-trip back
                     // to the server, we persist the image choice.
-                    node.all('#paginate a').each(function(pageLink) {
+                    node.all('#paginate a').each(function (pageLink) {
                         var pageUrl = pageLink.get('href');
-                        pageLink.set('href', pageUrl.replace(/\/image\/\d+/, '/image/'+imageID));
+                        pageLink.set('href', pageUrl.replace(/\/image\/\d+/, '/image/' + imageID));
                     });
 
                     Y.log('broadcast flickr-image-chosen ' + imageID, 'debug', NAME);
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/controller.common.js b/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/controller.common.js
index a2255b453..524dff1f8 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/controller.common.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/controller.common.js
@@ -4,8 +4,20 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add('PagedFlickr', function(Y, NAME) {
+YUI.add('PagedFlickr', function (Y, NAME) {
 
+
+    "use strict";
+    function selfUrl(ac, mojitType, mods) {
+        var params = Y.mojito.util.copy(ac.params.merged()),
+            k = null;
+        for (k in mods) {
+            if (mods.hasOwnProperty(k)) {
+                params[k] = mods[k];
+            }
+        }
+        return ac.url.make(mojitType, 'index', Y.QueryString.stringify(params));
+    }
 /**
  * The PagedFlickr module.
  *
@@ -28,7 +40,7 @@ YUI.add('PagedFlickr', function(Y, NAME) {
          * @param ac {Object} The action context that provides access
          *        to the Mojito API.
          */
-        index: function(ac) {
+        index: function (ac) {
 
             Y.log(ac.params.all());
 
@@ -43,37 +55,36 @@ YUI.add('PagedFlickr', function(Y, NAME) {
 
             // The "page" parameter is base-1, but the model's "start"
             // parameter is base-0.
-            start = (page-1) * PAGESIZE;
+            start = (page - 1) * PAGESIZE;
 
-            ac.models.flickr.getFlickrImages('mojito', start, PAGESIZE, function(err, images) {
-               var dateString, data;
+            ac.models.ModelFlickr.getFlickrImages('mojito', start, PAGESIZE, function (err, images) {
+                var dateString, data;
 
                 // on model error, fail fast
                 if (err) {
                     return ac.error(err);
                 }
-
                 dateString = ac.intl.formatDate(new Date());
                 data = {
                     date: dateString,
                     greeting: ac.intl.lang("TITLE"),
                     prev: {
-                        url: selfUrl(ac, 'flickr', { page: page-1 } ),
+                        url: selfUrl(ac, 'flickr', { page: page - 1 }),
                         title: ac.intl.lang("PREV") || 'prev'
                     },
                     next: {
-                        url: selfUrl(ac, 'flickr', { page: page+1 } ),
+                        url: selfUrl(ac, 'flickr', { page: page + 1 }),
                         title: ac.intl.lang("NEXT") || 'next'
                     }
                 };
 
-                Y.Array.each(images, function(image) {
+                Y.Array.each(images, function (image) {
                     image.detail_url = selfUrl(ac, 'flickr', { image: image.id });
                 }, this);
                 data.images = images;
 
                 if (page > 1) {
-                    data.prev.url = selfUrl(ac, 'flickr', { page: page-1 });
+                    data.prev.url = selfUrl(ac, 'flickr', { page: page - 1 });
                     data.has_prev = true;
                 }
                 ac.done(data);
@@ -82,12 +93,5 @@ YUI.add('PagedFlickr', function(Y, NAME) {
         }
     };
 
-    function selfUrl(ac, mojitType, mods) {
-        var params = Y.mojito.util.copy(ac.params.merged());
-        for (var k in mods) {
-            params[k] = mods[k];
-        }
-        return ac.url.make(mojitType, 'index', Y.QueryString.stringify(params));
-    }
 
 }, '0.0.1', {requires: ['mojito-intl-addon', 'mojito-util', 'querystring-stringify', 'ModelFlickr'], lang: ['de', 'en-US']});
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/lang/PagedFlickr_de.js b/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/lang/PagedFlickr_de.js
index 5d8715d01..1347db7e5 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/lang/PagedFlickr_de.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/lang/PagedFlickr_de.js
@@ -4,8 +4,8 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add("lang/PagedFlickr_de", function(Y) {
-
+YUI.add("lang/PagedFlickr_de", function (Y) {
+    "use strict";
     Y.Intl.add(
 
         "PagedFlickr",  // associated module
diff --git a/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/lang/PagedFlickr_en-US.js b/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/lang/PagedFlickr_en-US.js
index 2db027bd4..2cecc23b0 100644
--- a/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/lang/PagedFlickr_en-US.js
+++ b/examples/getting-started-guide/part5/flickr-list/mojits/PagedFlickr/lang/PagedFlickr_en-US.js
@@ -4,8 +4,8 @@
  * See the accompanying LICENSE file for terms.
  */
 
-YUI.add("lang/PagedFlickr_en-US", function(Y) {
-
+YUI.add("lang/PagedFlickr_en-US", function (Y) {
+    "use strict";
     Y.Intl.add(
 
         "PagedFlickr",  // associated module
diff --git a/examples/getting-started-guide/part5/flickr-list/routes.json b/examples/getting-started-guide/part5/flickr-list/routes.json
index 54c7733e3..97099c2ea 100644
--- a/examples/getting-started-guide/part5/flickr-list/routes.json
+++ b/examples/getting-started-guide/part5/flickr-list/routes.json
@@ -1,19 +1,16 @@
 [
     {
         "settings": [ "master" ],
-
         "flickr_by_page": {
             "verbs": ["get"],
             "path": "/flickr/page/:page/image/:image",
             "call": "flickr.index"
         },
-
         "flickr_base": {
             "verbs": ["get"],
             "path": "/flickr",
             "params": "page=1&image=0",
             "call": "flickr.index"
         }
-        
     }
 ]