diff --git a/build.sbt b/build.sbt
index 98407a847b7..ed442e9dcab 100644
--- a/build.sbt
+++ b/build.sbt
@@ -5,7 +5,7 @@ organization := "com.wordnik"
 
 name := "swagger-codegen"
 
-version := "2.0.2-SNAPSHOT"
+version := "2.0.3-SNAPSHOT"
 
 scalaVersion := "2.9.2"
 
diff --git a/src/main/resources/asyncscala/api.mustache b/src/main/resources/asyncscala/api.mustache
index 69fa95c436d..61e7f5eb111 100644
--- a/src/main/resources/asyncscala/api.mustache
+++ b/src/main/resources/asyncscala/api.mustache
@@ -3,9 +3,8 @@ package {{package}}
 {{#imports}}import {{import}}
 {{/imports}}
 import com.wordnik.swagger.client._
-import akka.dispatch.{ Future, Await }
-import akka.util.duration._
-import akka.util.Duration
+import scala.concurrent.{ Future, Await }
+import scala.concurrent.duration._
 import collection.mutable
 
 {{#operations}}
diff --git a/src/main/resources/asyncscala/sbt.mustache b/src/main/resources/asyncscala/sbt.mustache
index acfa21bc7d0..8196b7625f9 100644
--- a/src/main/resources/asyncscala/sbt.mustache
+++ b/src/main/resources/asyncscala/sbt.mustache
@@ -2,6 +2,8 @@ organization := "com.wordnik.samples"
 
 name := "{{projectName}}-client"
 
+scalaVersion := "2.10.0"
+
 libraryDependencies += "com.wordnik.swagger" %% "swagger-async-httpclient" % "0.1.4"
 
 libraryDependencies += "joda-time" % "joda-time" % "2.2"
diff --git a/src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala b/src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala
index f1b87e32a37..4b17b7bd989 100644
--- a/src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala
+++ b/src/main/scala/com/wordnik/swagger/codegen/util/CoreUtils.scala
@@ -23,6 +23,8 @@ import scala.collection.JavaConversions._
 import com.wordnik.swagger.codegen.spec.SwaggerSpec._
 
 import scala.io.Source
+import scala.collection.mutable
+import scala.annotation.tailrec
 
 object CoreUtils {
   def extractAllModels(apis: List[ApiListing]): Map[String, Model] = {
@@ -87,40 +89,28 @@ object CoreUtils {
     allModels.filter(m => primitives.contains(m._1) == false).toMap
   }
 
-  def recurseModels(requiredModels: Map[String, Model], allModels: Map[String, Model], subNames: HashSet[String]) = {
-    requiredModels.map(m => recurseModel(m._2, allModels, subNames))
+  def recurseModels(requiredModels: Map[String, Model], allModels: Map[String, Model], subNames: HashSet[String]) {
+    requiredModels foreach (m => subNames ++ recurseModel(m._2.properties.toList, allModels, subNames.toSet))
   }
 
-  def recurseModel(model: Model, allModels: Map[String, Model], subNames: HashSet[String]): Unit = {
-    model.properties.foreach(prop => {
-      val subObject = prop._2
-      val propertyName = containers.contains(subObject.`type`) match {
-        case true => subObject.items match {
-          case Some(subItem) => {
-            Option(subItem.ref.getOrElse(subItem.`type`)) match {
-              case Some(sn) => Some(sn)
-              case _ => None
-            }
+  @tailrec def recurseModel(properties: List[(String, ModelProperty)], allModels: Map[String, Model], subNames: Set[String]): Set[String] = {
+    properties match {
+      case Nil => subNames
+      case (_, subObject) :: rest =>
+        val propertyName = if (containers.contains(subObject.`type`)) {
+          subObject.items flatMap { subItem =>
+            Option(subItem.ref.getOrElse(subItem.`type`))
           }
-          case _ => None
-        }
-        case false => Some(subObject.`type`)
-      }
-      propertyName match {
-        case Some(property) => subNames.contains(property) match {
-          case false => {
-            allModels.containsKey(property) match {
-              case true => {
-                recurseModel(allModels(property), allModels, subNames)
-              }
-              case false =>
-            }
-            subNames += property
+        } else Option((subObject.`type`))
+
+        if (propertyName.isDefined && !subNames.contains(propertyName.get)) {
+          val prop = propertyName.get
+          if (allModels.contains(prop)) {
+            recurseModel(allModels(prop).properties.toList, allModels, subNames + prop)
+          } else {
+            recurseModel(rest, allModels, subNames + prop)
           }
-          case true =>
-        }
-        case None =>
-      }
-    })
+        } else recurseModel(rest, allModels, subNames)
+    }
   }
 }