diff --git a/cake/console/libs/templates/objects/model.ctp b/cake/console/libs/templates/objects/model.ctp
index 5cb28dc9c..06b2ca22e 100644
--- a/cake/console/libs/templates/objects/model.ctp
+++ b/cake/console/libs/templates/objects/model.ctp
@@ -21,6 +21,7 @@
  */
 
 echo "<?php\n"; ?>
+
 class <?php echo $name ?> extends <?php echo $plugin; ?>AppModel {
 	var $name = '<?php echo $name; ?>';
 <?php if ($useDbConfig != 'default'): ?>
@@ -32,11 +33,11 @@ class <?php echo $name ?> extends <?php echo $plugin; ?>AppModel {
 		$table = 'false';
 	endif;
 	echo "\tvar \$useTable = $table;\n";
-endif; ?>
-<?php if ($primaryKey !== 'id'): ?>
+endif;
+if ($primaryKey !== 'id'): ?>
 	var $primaryKey = '<?php echo $primaryKey; ?>';
-<?php endif; ?>
-<?php 
+<?php endif;
+
 if (!empty($validate)):
 	echo "\tvar \$validate = array(\n";
 	foreach ($validate as $field => $validations):
@@ -47,7 +48,11 @@ if (!empty($validate)):
 		echo "\t\t),\n";
 	endforeach;
 	echo "\t);\n";
-endif; 
+endif;
+
+?>
+	//The Associations below have been created with all possible keys, those that are not needed can be removed
+<?php
 
 foreach (array('hasOne', 'belongsTo') as $assocType):
 	if (!empty($associations[$assocType])):
@@ -122,4 +127,5 @@ if (!empty($associations['hasAndBelongsToMany'])):
 	echo "\n\t);\n\n";
 endif;
 ?>
+}
 <?php echo '?>'; ?>
diff --git a/cake/tests/cases/console/libs/tasks/model.test.php b/cake/tests/cases/console/libs/tasks/model.test.php
index d66a6c9d3..7ae9b592e 100644
--- a/cake/tests/cases/console/libs/tasks/model.test.php
+++ b/cake/tests/cases/console/libs/tasks/model.test.php
@@ -547,6 +547,7 @@ class ModelTaskTest extends CakeTestCase {
 		$pattern = '/' . preg_quote("'notempty' => array('rule' => array('notempty')),", '/') . '/';
 		$this->assertPattern($pattern, $result);
 	}
+
 /**
  * test baking relations
  *