diff --git a/code-gen/conf/templates/java/ModelObject.st b/code-gen/conf/templates/java/ModelObject.st
index 61b435fb311..75ebd5a1999 100644
--- a/code-gen/conf/templates/java/ModelObject.st
+++ b/code-gen/conf/templates/java/ModelObject.st
@@ -15,17 +15,19 @@ import $import$;
  */
 public class $className$ extends $extends$ {
 
-	$fields:{ field |
-	 //$field.description$
-	 private $field.fieldDefinition.returnType$ $field.fieldDefinition.name$ $field.fieldDefinition.initialization$;  
-	}$
-	
-	$fields:{ field |
-	 //$field.description$
-	 $if(field.required)$ 
-	 @Required $endif$
-	 $if(field.allowableValues)$
-	 @AllowableValues(value="$field.allowableValues$")$endif$	 
+$fields:{ field |
+
+    /**
+     * $field.description$
+     */
+	 private $field.fieldDefinition.returnType$ $field.fieldDefinition.name$ $field.fieldDefinition.initialization$;$\r$}$
+
+$fields:{ field |
+	/**
+	 * $field.description$
+	 * $if(field.required)$@Required$endif$
+	 * $if(field.allowableValues)$@AllowableValues(value="$field.allowedValuesString$")$endif$
+	 */
 	 public $field.fieldDefinition.returnType$ get$field.fieldDefinition.NameForMethod$() {
 	 	return $field.fieldDefinition.name$;
 	 }  
@@ -33,5 +35,6 @@ public class $className$ extends $extends$ {
 	 public void set$field.fieldDefinition.NameForMethod$($field.fieldDefinition.returnType$  $field.fieldDefinition.name$) {
 	 	this.$field.fieldDefinition.name$ = $field.fieldDefinition.name$;
 	 }
-	}$
+
+}$
 }
\ No newline at end of file
diff --git a/code-gen/src/main/java/com/wordnik/codegen/resource/ModelField.java b/code-gen/src/main/java/com/wordnik/codegen/resource/ModelField.java
index af9f01bf587..3c5e2b09fb1 100644
--- a/code-gen/src/main/java/com/wordnik/codegen/resource/ModelField.java
+++ b/code-gen/src/main/java/com/wordnik/codegen/resource/ModelField.java
@@ -96,8 +96,10 @@ public class ModelField {
 
     public String getAllowedValuesString() {
         String result = "";
-        for(String allowedValue: this.allowableValues){
-            result += (allowedValue +",");
+        if (this.allowableValues != null) {
+            for(String allowedValue: this.allowableValues){
+                result += (allowedValue +",");
+            }
         }
         if(result.length() == 0)
             return null;
diff --git a/java/conf/templates/ModelObject.st b/java/conf/templates/ModelObject.st
index fb4d86e869c..bd695376161 100644
--- a/java/conf/templates/ModelObject.st
+++ b/java/conf/templates/ModelObject.st
@@ -15,17 +15,19 @@ import $import$;
  */
 public class $className$ extends $extends$ {
 
-	$fields:{ field |
-	 //$field.description$
-	 private $field.fieldDefinition.returnType$ $field.fieldDefinition.name$ $field.fieldDefinition.initialization$;  
-	}$
+$fields:{ field |
+     /**
+     * $field.description$
+     */
+	 private $field.fieldDefinition.returnType$ $field.fieldDefinition.name$ $field.fieldDefinition.initialization$;$\n$
+	 }$
 	
-	$fields:{ field |
-	 //$field.description$
-	 $if(field.required)$ 
-	 @Required $endif$
-	 $if(field.allowableValues)$
-	 @AllowableValues(value="$field.allowableValues$")$endif$	 
+$fields:{ field |
+	 /**
+	 * $field.description$
+	 * $if(field.required)$@Required$endif$
+	 * $if(field.allowedValuesString)$@AllowableValues(value="$field.allowableValues$")$endif$
+	 */
 	 public $field.fieldDefinition.returnType$ get$field.fieldDefinition.NameForMethod$() {
 	 	return $field.fieldDefinition.name$;
 	 }  
@@ -33,5 +35,5 @@ public class $className$ extends $extends$ {
 	 public void set$field.fieldDefinition.NameForMethod$($field.fieldDefinition.returnType$  $field.fieldDefinition.name$) {
 	 	this.$field.fieldDefinition.name$ = $field.fieldDefinition.name$;
 	 }
-	}$
+     }$
 }
\ No newline at end of file