diff --git a/samples/server-generator/scalatra/output/build.sbt b/samples/server-generator/scalatra/output/build.sbt
index 97b4db0ebfb..dec0f65b33d 100644
--- a/samples/server-generator/scalatra/output/build.sbt
+++ b/samples/server-generator/scalatra/output/build.sbt
@@ -1,8 +1,13 @@
 import AssemblyKeys._ // put this at the top of the file
-import com.github.siasia.PluginKeys._ 
+
+import NativePackagerKeys._
+
+packageArchetype.java_server
 
 assemblySettings
 
+scalariformSettings
+
 organization := "com.wordnik"
 
 seq(webSettings :_*)
@@ -13,25 +18,22 @@ name := "scalatra-sample"
 
 version := "0.1.0-SNAPSHOT"
 
-scalaVersion := "2.9.2"
+scalaVersion := "2.10.0"
 
 libraryDependencies ++= Seq(
-  "org.scalatest"           %% "scalatest"                      % "1.6.1"               % "test",
-  "org.scalatra"             % "scalatra"                       % "2.2.1-SNAPSHOT",
-  "org.scalatra"             % "scalatra-auth"                  % "2.2.1-SNAPSHOT",
-  "org.scalatra"             % "scalatra-scalate"               % "2.2.1-SNAPSHOT",
-  "org.scalatra"             % "scalatra-json"                  % "2.2.1-SNAPSHOT",
-  "org.scalatra"             % "scalatra-fileupload"            % "2.2.1-SNAPSHOT",
-  "org.scalatra"             % "scalatra-swagger"               % "2.2.1-SNAPSHOT",
-  "org.scalatra"             % "scalatra-swagger-ext"           % "2.2.1-SNAPSHOT",
-  "org.scalatra"             % "scalatra-slf4j"                 % "2.2.1-SNAPSHOT",
-  "org.scalatra"             % "scalatra-specs2"                % "2.2.1-SNAPSHOT"      % "test",
+  "org.scalatest"           %% "scalatest"                      % "2.0"               % "test",
+  "org.scalatra"            %% "scalatra"                       % "2.3.0.M1",
+  "org.scalatra"            %% "scalatra-scalate"               % "2.3.0.M1",
+  "org.scalatra"            %% "scalatra-json"                  % "2.3.0.M1",
+  "org.scalatra"            %% "scalatra-swagger"               % "2.3.0.M1",
+  "org.scalatra"            %% "scalatra-swagger-ext"           % "2.3.0.M1",
+  "org.scalatra"            %% "scalatra-slf4j"                 % "2.3.0.M1",
   "org.json4s"              %% "json4s-jackson"                 % "3.1.0",
   "org.json4s"              %% "json4s-ext"                     % "3.1.0",
   "commons-codec"            % "commons-codec"                  % "1.7",
   "net.databinder.dispatch" %% "dispatch-core"                  % "0.9.5",
   "net.databinder.dispatch" %% "json4s-jackson"                 % "0.9.5",
-  "com.typesafe.akka"        % "akka-actor"                     % "2.0.2",
+  "com.typesafe.akka"       %% "akka-actor"                     % "2.1.0",
   "org.eclipse.jetty"        % "jetty-server"                   % "8.1.7.v20120910" % "container;provided",
   "org.eclipse.jetty"        % "jetty-webapp"                   % "8.1.7.v20120910" % "container;provided",
   "org.eclipse.jetty.orbit"  % "javax.servlet"                  % "3.0.0.v201112011016" % "container;compile;provided;test" artifacts (Artifact("javax.servlet", "jar", "jar"))
@@ -55,4 +57,3 @@ mergeStrategy in assembly <<= (mergeStrategy in assembly) { (old) =>
     case x => old(x)
   }
 }
-
diff --git a/samples/server-generator/scalatra/output/project/build.properties b/samples/server-generator/scalatra/output/project/build.properties
index a8c2f849be3..8cbb5226c45 100644
--- a/samples/server-generator/scalatra/output/project/build.properties
+++ b/samples/server-generator/scalatra/output/project/build.properties
@@ -1 +1 @@
-sbt.version=0.12.0
+sbt.version=0.13.0
\ No newline at end of file
diff --git a/samples/server-generator/scalatra/output/project/plugins.sbt b/samples/server-generator/scalatra/output/project/plugins.sbt
index 713b7f3e993..94de8e5414f 100644
--- a/samples/server-generator/scalatra/output/project/plugins.sbt
+++ b/samples/server-generator/scalatra/output/project/plugins.sbt
@@ -1,9 +1,7 @@
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.8.4")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.10.1")
 
-libraryDependencies <+= sbtVersion(v => v match {
-  case "0.11.0" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.0-0.2.8"
-  case "0.11.1" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.1-0.2.10"
-  case "0.11.2" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.2-0.2.11"
-  case "0.11.3" => "com.github.siasia" %% "xsbt-web-plugin" % "0.11.3-0.2.11.1"
-  case x if (x.startsWith("0.12")) => "com.github.siasia" %% "xsbt-web-plugin" % "0.12.0-0.2.11.1"
-})
\ No newline at end of file
+addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.6.4")
+
+addSbtPlugin("com.earldouglas" % "xsbt-web-plugin" % "0.6.0")
+
+addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.2.1")
diff --git a/samples/server-generator/scalatra/output/src/main/scala/ScalatraBootstrap.scala b/samples/server-generator/scalatra/output/src/main/scala/ScalatraBootstrap.scala
index 01449055cf4..9b637972ced 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/ScalatraBootstrap.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/ScalatraBootstrap.scala
@@ -1,5 +1,6 @@
 import apis._
-import com.wordnik.swagger.app.{ResourcesApp, SwaggerApp}
+import akka.actor.ActorSystem
+import com.wordnik.swagger.app.{ ResourcesApp, SwaggerApp }
 import javax.servlet.ServletContext
 import org.scalatra.LifeCycle
 
@@ -7,10 +8,11 @@ class ScalatraBootstrap extends LifeCycle {
   implicit val swagger = new SwaggerApp
 
   override def init(context: ServletContext) {
+    implicit val system = ActorSystem("mySystem")
     try {
+      context mount (new UserApi, "/user/*")
       context mount (new PetApi, "/pet/*")
       context mount (new StoreApi, "/store/*")
-      context mount (new UserApi, "/user/*")
       context mount (new ResourcesApp, "/api-docs/*")
     } catch {
       case e: Throwable => e.printStackTrace()
diff --git a/samples/server-generator/scalatra/output/src/main/scala/ServletApp.scala b/samples/server-generator/scalatra/output/src/main/scala/ServletApp.scala
index 236e32269ea..acb57c31e3e 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/ServletApp.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/ServletApp.scala
@@ -1,27 +1,39 @@
 package com.wordnik.swagger.app
 
-import com.wordnik.swagger.core.SwaggerSpec
-import org.scalatra.swagger.{JacksonSwaggerBase, Swagger}
-import org.scalatra.ScalatraServlet
-import org.json4s.{DefaultFormats, Formats}
+import _root_.akka.actor.ActorSystem
 
-class ResourcesApp(implicit val swagger: Swagger) extends ScalatraServlet with JacksonSwaggerBase {
+import org.scalatra.swagger.{ ApiInfo, SwaggerWithAuth, Swagger }
+import org.scalatra.swagger.{ JacksonSwaggerBase, Swagger }
+import org.scalatra.ScalatraServlet
+import org.json4s.{ DefaultFormats, Formats }
+
+class ResourcesApp(implicit protected val system: ActorSystem, val swagger: SwaggerApp)
+    extends ScalatraServlet with JacksonSwaggerBase {
   before() {
     response.headers += ("Access-Control-Allow-Origin" -> "*")
   }
 
   protected def buildFullUrl(path: String) = if (path.startsWith("http")) path else {
-   val port = request.getServerPort
-   val h = request.getServerName
-   val prot = if (port == 443) "https" else "http"
-   val (proto, host) = if (port != 80 && port != 443) ("http", h+":"+port.toString) else (prot, h)
-   "%s://%s%s%s".format(
-     proto,
-     host,
-     request.getContextPath,
-     path)
+    val port = request.getServerPort
+    val h = request.getServerName
+    val prot = if (port == 443) "https" else "http"
+    val (proto, host) = if (port != 80 && port != 443) ("http", h + ":" + port.toString) else (prot, h)
+    "%s://%s%s%s".format(
+      proto,
+      host,
+      request.getContextPath,
+      path)
   }
 }
 
-class SwaggerApp extends Swagger(SwaggerSpec.version, "1")
+class SwaggerApp extends Swagger(apiInfo = ApiSwagger.apiInfo, apiVersion = "1.0", swaggerVersion = "1.2")
 
+object ApiSwagger {
+  val apiInfo = ApiInfo(
+    "Swagger Sample",
+    "A sample swagger server",
+    "http://developers.helloreverb.com",
+    "hello@helloreverb.com",
+    "All rights reserved",
+    "http://apache.org/licenses/LICENSE-2.0.html")
+}
diff --git a/samples/server-generator/scalatra/output/src/main/scala/apis/PetApi.scala b/samples/server-generator/scalatra/output/src/main/scala/apis/PetApi.scala
index 9e80b08ca35..b6b787654a9 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/apis/PetApi.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/apis/PetApi.scala
@@ -1,8 +1,7 @@
 package apis
 
+import java.io.File
 import com.wordnik.client.model.Pet
-import com.wordnik.swagger.core.ApiPropertiesReader
-
 import org.scalatra.{ TypedParamSupport, ScalatraServlet }
 import org.scalatra.swagger._
 import org.json4s._
@@ -11,7 +10,7 @@ import org.scalatra.json.{ JValueResult, JacksonJsonSupport }
 
 import scala.collection.JavaConverters._
 
-class PetApi (implicit val swagger: Swagger) extends ScalatraServlet 
+class PetApi(implicit val swagger: Swagger) extends ScalatraServlet
     with JacksonJsonSupport
     with SwaggerSupport {
   protected implicit val jsonFormats: Formats = DefaultFormats
@@ -24,73 +23,111 @@ class PetApi (implicit val swagger: Swagger) extends ScalatraServlet
     response.headers += ("Access-Control-Allow-Origin" -> "*")
   }
 
-
   val getPetByIdOperation = (apiOperation[Pet]("getPetById")
-      summary "Find pet by ID"
-      parameters(
-        pathParam[String]("petId").description(""))
+    summary "Find pet by ID"
+    parameters (
+      pathParam[Long]("petId").description(""))
   )
-  
 
-  get("/:petId",operation(getPetByIdOperation)) {
+  get("/:petId", operation(getPetByIdOperation)) {
     val petId = params.getOrElse("petId", halt(400))
-    println(petId)
+    println("petId: " + petId)
   }
 
+  val deletePetOperation = (apiOperation[Unit]("deletePet")
+    summary "Deletes a pet"
+    parameters (
+      pathParam[String]("petId").description(""))
+  )
 
+  delete("/:petId", operation(deletePetOperation)) {
+    val petId = params.getOrElse("petId", halt(400))
+    println("petId: " + petId)
+  }
+
+  val partialUpdateOperation = (apiOperation[List[Pet]]("partialUpdate")
+    summary "partial updates to a pet"
+    parameters (
+      pathParam[String]("petId").description(""), bodyParam[Pet]("body").description(""))
+  )
+
+  patch("/:petId", operation(partialUpdateOperation)) {
+    val petId = params.getOrElse("petId", halt(400))
+    println("petId: " + petId)
+    val body = parsedBody.extract[Pet]
+    println("body: " + body)
+  }
+
+  val updatePetWithFormOperation = (apiOperation[Unit]("updatePetWithForm")
+    summary "Updates a pet in the store with form data"
+    parameters (
+      pathParam[String]("petId").description(""), queryParam[String]("name").description(""), queryParam[String]("status").description(""))
+  )
+
+  post("/:petId", operation(updatePetWithFormOperation)) {
+    val petId = params.getOrElse("petId", halt(400))
+    println("petId: " + petId)
+    val name = params.getAs[String]("name")
+    println("name: " + name)
+    val status = params.getAs[String]("status")
+    println("status: " + status)
+  }
+
+  val uploadFileOperation = (apiOperation[Unit]("uploadFile")
+    summary "uploads an image"
+    parameters (
+      queryParam[String]("additionalMetadata").description(""), bodyParam[File]("body").description("").optional)
+  )
+
+  post("/uploadImage", operation(uploadFileOperation)) {
+    val additionalMetadata = params.getAs[String]("additionalMetadata")
+    println("additionalMetadata: " + additionalMetadata)
+    val body = parsedBody.extract[File]
+    println("body: " + body)
+  }
 
   val addPetOperation = (apiOperation[Unit]("addPet")
-      summary "Add a new pet to the store"
-      parameters(
-        bodyParam[Pet]("body").description(""))
+    summary "Add a new pet to the store"
+    parameters (
+      bodyParam[Pet]("body").description(""))
   )
-  
 
-  post("/",operation(addPetOperation)) {
+  post("/", operation(addPetOperation)) {
     val body = parsedBody.extract[Pet]
-    println(body)
+    println("body: " + body)
   }
 
-
-
   val updatePetOperation = (apiOperation[Unit]("updatePet")
-      summary "Update an existing pet"
-      parameters(
-        bodyParam[Pet]("body").description(""))
+    summary "Update an existing pet"
+    parameters (
+      bodyParam[Pet]("body").description(""))
   )
-  
 
-  put("/",operation(updatePetOperation)) {
+  put("/", operation(updatePetOperation)) {
     val body = parsedBody.extract[Pet]
-    println(body)
+    println("body: " + body)
   }
 
-
-
   val findPetsByStatusOperation = (apiOperation[List[Pet]]("findPetsByStatus")
-      summary "Finds Pets by status"
-      parameters(
-        queryParam[String]("status").description("").defaultValue("available"))
+    summary "Finds Pets by status"
+    parameters (
+      queryParam[String]("status").description("").defaultValue("available"))
   )
-  
 
-  get("/findByStatus",operation(findPetsByStatusOperation)) {
+  get("/findByStatus", operation(findPetsByStatusOperation)) {
     val status = params.getAs[String]("status")
-    println(status)
+    println("status: " + status)
   }
 
-
-
   val findPetsByTagsOperation = (apiOperation[List[Pet]]("findPetsByTags")
-      summary "Finds Pets by tags"
-      parameters(
-        queryParam[String]("tags").description(""))
+    summary "Finds Pets by tags"
+    parameters (
+      queryParam[String]("tags").description(""))
   )
-  
 
-  get("/findByTags",operation(findPetsByTagsOperation)) {
+  get("/findByTags", operation(findPetsByTagsOperation)) {
     val tags = params.getAs[String]("tags")
-    println(tags)
+    println("tags: " + tags)
   }
 
 }
diff --git a/samples/server-generator/scalatra/output/src/main/scala/apis/StoreApi.scala b/samples/server-generator/scalatra/output/src/main/scala/apis/StoreApi.scala
index 8ee1e8d2b05..dfd6fe4d238 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/apis/StoreApi.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/apis/StoreApi.scala
@@ -1,8 +1,6 @@
 package apis
 
 import com.wordnik.client.model.Order
-import com.wordnik.swagger.core.ApiPropertiesReader
-
 import org.scalatra.{ TypedParamSupport, ScalatraServlet }
 import org.scalatra.swagger._
 import org.json4s._
@@ -11,7 +9,7 @@ import org.scalatra.json.{ JValueResult, JacksonJsonSupport }
 
 import scala.collection.JavaConverters._
 
-class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet 
+class StoreApi(implicit val swagger: Swagger) extends ScalatraServlet
     with JacksonJsonSupport
     with SwaggerSupport {
   protected implicit val jsonFormats: Formats = DefaultFormats
@@ -24,45 +22,37 @@ class StoreApi (implicit val swagger: Swagger) extends ScalatraServlet
     response.headers += ("Access-Control-Allow-Origin" -> "*")
   }
 
-
   val getOrderByIdOperation = (apiOperation[Order]("getOrderById")
-      summary "Find purchase order by ID"
-      parameters(
-        pathParam[String]("orderId").description(""))
+    summary "Find purchase order by ID"
+    parameters (
+      pathParam[String]("orderId").description(""))
   )
-  
 
-  get("/order/:orderId",operation(getOrderByIdOperation)) {
+  get("/order/:orderId", operation(getOrderByIdOperation)) {
     val orderId = params.getOrElse("orderId", halt(400))
-    println(orderId)
+    println("orderId: " + orderId)
   }
 
-
-
   val deleteOrderOperation = (apiOperation[Unit]("deleteOrder")
-      summary "Delete purchase order by ID"
-      parameters(
-        pathParam[String]("orderId").description(""))
+    summary "Delete purchase order by ID"
+    parameters (
+      pathParam[String]("orderId").description(""))
   )
-  
 
-  delete("/order/:orderId",operation(deleteOrderOperation)) {
+  delete("/order/:orderId", operation(deleteOrderOperation)) {
     val orderId = params.getOrElse("orderId", halt(400))
-    println(orderId)
+    println("orderId: " + orderId)
   }
 
-
-
   val placeOrderOperation = (apiOperation[Unit]("placeOrder")
-      summary "Place an order for a pet"
-      parameters(
-        bodyParam[Order]("body").description(""))
+    summary "Place an order for a pet"
+    parameters (
+      bodyParam[Order]("body").description(""))
   )
-  
 
-  post("/order",operation(placeOrderOperation)) {
+  post("/order", operation(placeOrderOperation)) {
     val body = parsedBody.extract[Order]
-    println(body)
+    println("body: " + body)
   }
 
 }
diff --git a/samples/server-generator/scalatra/output/src/main/scala/apis/UserApi.scala b/samples/server-generator/scalatra/output/src/main/scala/apis/UserApi.scala
index c498e18dab5..4440ce26186 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/apis/UserApi.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/apis/UserApi.scala
@@ -1,8 +1,6 @@
 package apis
 
 import com.wordnik.client.model.User
-import com.wordnik.swagger.core.ApiPropertiesReader
-
 import org.scalatra.{ TypedParamSupport, ScalatraServlet }
 import org.scalatra.swagger._
 import org.json4s._
@@ -11,7 +9,7 @@ import org.scalatra.json.{ JValueResult, JacksonJsonSupport }
 
 import scala.collection.JavaConverters._
 
-class UserApi (implicit val swagger: Swagger) extends ScalatraServlet 
+class UserApi(implicit val swagger: Swagger) extends ScalatraServlet
     with JacksonJsonSupport
     with SwaggerSupport {
   protected implicit val jsonFormats: Formats = DefaultFormats
@@ -24,117 +22,93 @@ class UserApi (implicit val swagger: Swagger) extends ScalatraServlet
     response.headers += ("Access-Control-Allow-Origin" -> "*")
   }
 
+  val createUserOperation = (apiOperation[Unit]("createUser")
+    summary "Create user"
+    parameters (
+      bodyParam[User]("body").description(""))
+  )
+
+  post("/", operation(createUserOperation)) {
+    val body = parsedBody.extract[User]
+    println("body: " + body)
+  }
 
   val createUsersWithArrayInputOperation = (apiOperation[Unit]("createUsersWithArrayInput")
-      summary "Creates list of users with given input array"
-      parameters(
-        bodyParam[List[User]]("body").description(""))
+    summary "Creates list of users with given input array"
+    parameters (
+      bodyParam[List[User]]("body").description(""))
   )
-  
 
-  post("/createWithArray",operation(createUsersWithArrayInputOperation)) {
+  post("/createWithArray", operation(createUsersWithArrayInputOperation)) {
     val body = parsedBody.extract[List[User]]
-    println(body)
+    println("body: " + body)
   }
 
-
-
-  val createUserOperation = (apiOperation[Unit]("createUser")
-      summary "Create user"
-      parameters(
-        bodyParam[User]("body").description(""))
-  )
-  
-
-  post("/",operation(createUserOperation)) {
-    val body = parsedBody.extract[User]
-    println(body)
-  }
-
-
-
   val createUsersWithListInputOperation = (apiOperation[Unit]("createUsersWithListInput")
-      summary "Creates list of users with given list input"
-      parameters(
-        bodyParam[List[User]]("body").description(""))
+    summary "Creates list of users with given list input"
+    parameters (
+      bodyParam[List[User]]("body").description(""))
   )
-  
 
-  post("/createWithList",operation(createUsersWithListInputOperation)) {
+  post("/createWithList", operation(createUsersWithListInputOperation)) {
     val body = parsedBody.extract[List[User]]
-    println(body)
+    println("body: " + body)
   }
 
-
-
   val updateUserOperation = (apiOperation[Unit]("updateUser")
-      summary "Updated user"
-      parameters(
-        pathParam[String]("username").description(""),bodyParam[User]("body").description(""))
+    summary "Updated user"
+    parameters (
+      pathParam[String]("username").description(""), bodyParam[User]("body").description(""))
   )
-  
 
-  put("/:username",operation(updateUserOperation)) {
+  put("/:username", operation(updateUserOperation)) {
     val username = params.getOrElse("username", halt(400))
-    println(username)
-  val body = parsedBody.extract[User]
-    println(body)
+    println("username: " + username)
+    val body = parsedBody.extract[User]
+    println("body: " + body)
   }
 
-
-
   val deleteUserOperation = (apiOperation[Unit]("deleteUser")
-      summary "Delete user"
-      parameters(
-        pathParam[String]("username").description(""))
+    summary "Delete user"
+    parameters (
+      pathParam[String]("username").description(""))
   )
-  
 
-  delete("/:username",operation(deleteUserOperation)) {
+  delete("/:username", operation(deleteUserOperation)) {
     val username = params.getOrElse("username", halt(400))
-    println(username)
+    println("username: " + username)
   }
 
-
-
   val getUserByNameOperation = (apiOperation[User]("getUserByName")
-      summary "Get user by user name"
-      parameters(
-        pathParam[String]("username").description(""))
+    summary "Get user by user name"
+    parameters (
+      pathParam[String]("username").description(""))
   )
-  
 
-  get("/:username",operation(getUserByNameOperation)) {
+  get("/:username", operation(getUserByNameOperation)) {
     val username = params.getOrElse("username", halt(400))
-    println(username)
+    println("username: " + username)
   }
 
-
-
   val loginUserOperation = (apiOperation[String]("loginUser")
-      summary "Logs user into the system"
-      parameters(
-        queryParam[String]("username").description(""),queryParam[String]("password").description(""))
+    summary "Logs user into the system"
+    parameters (
+      queryParam[String]("username").description(""), queryParam[String]("password").description(""))
   )
-  
 
-  get("/login",operation(loginUserOperation)) {
+  get("/login", operation(loginUserOperation)) {
     val username = params.getAs[String]("username")
-    println(username)
-  val password = params.getAs[String]("password")
-    println(password)
+    println("username: " + username)
+    val password = params.getAs[String]("password")
+    println("password: " + password)
   }
 
-
-
   val logoutUserOperation = (apiOperation[Unit]("logoutUser")
-      summary "Logs out current logged in user session"
-      parameters(
-        )
+    summary "Logs out current logged in user session"
+    parameters ()
   )
-  
 
-  get("/logout",operation(logoutUserOperation)) {
-    }
+  get("/logout", operation(logoutUserOperation)) {
+  }
 
 }
diff --git a/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Category.scala b/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Category.scala
index 0daf7db6cbd..4bcd2a5c9ed 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Category.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Category.scala
@@ -1,9 +1,7 @@
 package com.wordnik.client.model
 
-case class Category (
+case class Category(
   id: Option[Long],
 
-  name: Option[String]
-
-  )
+  name: Option[String])
 
diff --git a/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Order.scala b/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Order.scala
index 5d2ae42bc4f..75d2dc73bed 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Order.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Order.scala
@@ -1,16 +1,14 @@
 package com.wordnik.client.model
 
 import java.util.Date
-case class Order (
+case class Order(
   id: Option[Long],
 
   petId: Option[Long],
 
-  status: Option[String],// Order Status
-
   quantity: Option[Int],
 
-  shipDate: Option[Date]
+  status: Option[String], // Order Status
 
-  )
+  shipDate: Option[Date])
 
diff --git a/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Pet.scala b/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Pet.scala
index f4964e815ce..088cbb5472c 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Pet.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Pet.scala
@@ -2,12 +2,17 @@ package com.wordnik.client.model
 
 import com.wordnik.client.model.Category
 import com.wordnik.client.model.Tag
-case class Pet (
-  tags: Option[List[Tag]],
-  id: Option[Long],
-  category: Option[Category],
-  status: Option[String],// pet status in the store
-  name: Option[String],
-  photoUrls: Option[List[String]]
-)
+case class Pet(
+  id: Long, // unique identifier for the pet
+
+  category: Option[Category],
+
+  name: String,
+
+  photoUrls: Option[List[String]],
+
+  tags: Option[List[Tag]],
+
+  status: Option[String] // pet status in the store
+  )
 
diff --git a/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Tag.scala b/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Tag.scala
index 2a9a94357c9..6f4a024b447 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Tag.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/Tag.scala
@@ -1,9 +1,7 @@
 package com.wordnik.client.model
 
-case class Tag (
+case class Tag(
   id: Option[Long],
 
-  name: Option[String]
-
-  )
+  name: Option[String])
 
diff --git a/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/User.scala b/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/User.scala
index f165bdf7114..228980a1a88 100644
--- a/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/User.scala
+++ b/samples/server-generator/scalatra/output/src/main/scala/com/wordnik/client/model/User.scala
@@ -1,21 +1,20 @@
 package com.wordnik.client.model
 
-case class User (
+case class User(
   id: Option[Long],
 
-  lastName: Option[String],
-
-  phone: Option[String],
-
-  username: Option[String],
-
-  email: Option[String],
-
-  userStatus: Option[Int],// User Status
-
   firstName: Option[String],
 
-  password: Option[String]
+  username: Option[String],
 
+  lastName: Option[String],
+
+  email: Option[String],
+
+  password: Option[String],
+
+  phone: Option[String],
+
+  userStatus: Option[Int] // User Status
   )