From 7af616b21aaf57f16611736c62a3849e59f7e644 Mon Sep 17 00:00:00 2001
From: Ying Tang <ytang@godaddy.com>
Date: Wed, 8 Apr 2015 17:03:22 -0700
Subject: [PATCH] review comments

---
 lib/model-helper.js | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/lib/model-helper.js b/lib/model-helper.js
index b4a4bc4..733ab66 100644
--- a/lib/model-helper.js
+++ b/lib/model-helper.js
@@ -97,7 +97,7 @@ var modelHelper = module.exports = {
       delete prop.required;
       delete prop.id;
 
-      if (prop.description) {
+      if (prop.description){
         prop.description = Array.isArray(prop.description) ? prop.description.join('') : prop.description;
       }
 
@@ -120,26 +120,27 @@ var modelHelper = module.exports = {
       }
     });
 
-    out[name] = {
-      id: name
-    };
-
+    var additionalProperties = undefined;
     if (def.settings){
       var strict = def.settings.strict;
-      var additionalProperties = def.settings.additionalProperties;
+      additionalProperties = def.settings.additionalProperties;
       var notAllowAdditionalProperties = strict || (additionalProperties !== true);
       if (notAllowAdditionalProperties){
-        out[name].additionalProperties = !notAllowAdditionalProperties;
+        additionalProperties = false;
       }
     }
 
+    out[name] = {
+      id: name,
+      additionalProperties: additionalProperties,
+      properties: properties,
+      required: required
+    };
+
     if (def.description){
       out[name].description = Array.isArray(def.description) ? def.description.join('') : def.description;
     }
 
-    out[name].properties =  properties;
-    out[name].required = required;
-
     // Generate model definitions for related models
     for (var r in modelClass.relations) {
       var rel = modelClass.relations[r];