diff --git a/modules/swagger-codegen/src/main/resources/retrofit/api.mustache b/modules/swagger-codegen/src/main/resources/retrofit/api.mustache
index 9d3094e38bd..db4a997196f 100644
--- a/modules/swagger-codegen/src/main/resources/retrofit/api.mustache
+++ b/modules/swagger-codegen/src/main/resources/retrofit/api.mustache
@@ -24,7 +24,7 @@ public interface {{classname}} {
   {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}}
   @{{httpMethod}}("{{path}}")  
   {{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}} {{nickname}}({{^allParams}});{{/allParams}}
-    {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}},{{/hasMore}}{{^hasMore}}
+    {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}{{#hasMore}}, {{/hasMore}}{{^hasMore}}
   );{{/hasMore}}{{/allParams}}
 
   /**
@@ -38,7 +38,7 @@ public interface {{classname}} {
   {{#isMultipart}}@Multipart{{/isMultipart}}{{^isMultipart}}@FormUrlEncoded{{/isMultipart}}{{/-first}}{{/formParams}}
   @{{httpMethod}}("{{path}}")  
   void {{nickname}}(
-    {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}},{{/allParams}} Callback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> cb
+    {{#allParams}}{{>queryParams}}{{>pathParams}}{{>headerParams}}{{>bodyParams}}{{>formParams}}, {{/allParams}}Callback<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}Object{{/returnType}}> cb
   ); 
   {{/operation}}
 }
diff --git a/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache b/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache
index 8ed9335b4ee..651c9bd6a64 100644
--- a/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache
+++ b/modules/swagger-codegen/src/main/resources/retrofit/pom.mustache
@@ -121,7 +121,6 @@
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
-      <scope>compile</scope>
     </dependency>
       <dependency>
       <groupId>com.squareup.okhttp</groupId>
@@ -139,7 +138,6 @@
   </dependencies>
   <properties>
     <swagger-annotations-version>1.5.0</swagger-annotations-version>
-    <gson-version>2.3.1</gson-version>
     <retrofit-version>1.9.0</retrofit-version>
     <okhttp-version>2.4.0</okhttp-version>
     <oltu-version>1.0.0</oltu-version>
diff --git a/samples/client/petstore/retrofit/pom.xml b/samples/client/petstore/retrofit/pom.xml
index 0c090b0b85e..bcbfdbf797d 100644
--- a/samples/client/petstore/retrofit/pom.xml
+++ b/samples/client/petstore/retrofit/pom.xml
@@ -121,7 +121,6 @@
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
       <version>${oltu-version}</version>
-      <scope>compile</scope>
     </dependency>
       <dependency>
       <groupId>com.squareup.okhttp</groupId>
@@ -139,7 +138,6 @@
   </dependencies>
   <properties>
     <swagger-annotations-version>1.5.0</swagger-annotations-version>
-    <gson-version>2.3.1</gson-version>
     <retrofit-version>1.9.0</retrofit-version>
     <okhttp-version>2.4.0</okhttp-version>
     <oltu-version>1.0.0</oltu-version>
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java
index dd485d7dcef..5efddc75dc4 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/PetApi.java
@@ -156,7 +156,7 @@ public interface PetApi {
   @FormUrlEncoded
   @POST("/pet/{petId}")  
   Void updatePetWithForm(
-    @Path("petId") Long petId,@Field("name") String name,@Field("status") String status
+    @Path("petId") Long petId, @Field("name") String name, @Field("status") String status
   );
 
   /**
@@ -172,7 +172,7 @@ public interface PetApi {
   @FormUrlEncoded
   @POST("/pet/{petId}")  
   void updatePetWithForm(
-    @Path("petId") Long petId,@Field("name") String name,@Field("status") String status, Callback<Void> cb
+    @Path("petId") Long petId, @Field("name") String name, @Field("status") String status, Callback<Void> cb
   ); 
   
   /**
@@ -186,7 +186,7 @@ public interface PetApi {
   
   @DELETE("/pet/{petId}")  
   Void deletePet(
-    @Path("petId") Long petId,@Header("api_key") String apiKey
+    @Path("petId") Long petId, @Header("api_key") String apiKey
   );
 
   /**
@@ -200,7 +200,7 @@ public interface PetApi {
   
   @DELETE("/pet/{petId}")  
   void deletePet(
-    @Path("petId") Long petId,@Header("api_key") String apiKey, Callback<Void> cb
+    @Path("petId") Long petId, @Header("api_key") String apiKey, Callback<Void> cb
   ); 
   
   /**
@@ -216,7 +216,7 @@ public interface PetApi {
   @Multipart
   @POST("/pet/{petId}/uploadImage")  
   ApiResponse uploadFile(
-    @Path("petId") Long petId,@Part("additionalMetadata") String additionalMetadata,@Part("file") TypedFile file
+    @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file") TypedFile file
   );
 
   /**
@@ -232,7 +232,7 @@ public interface PetApi {
   @Multipart
   @POST("/pet/{petId}/uploadImage")  
   void uploadFile(
-    @Path("petId") Long petId,@Part("additionalMetadata") String additionalMetadata,@Part("file") TypedFile file, Callback<ApiResponse> cb
+    @Path("petId") Long petId, @Part("additionalMetadata") String additionalMetadata, @Part("file") TypedFile file, Callback<ApiResponse> cb
   ); 
   
 }
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/StoreApi.java
index c9944dfc1ff..9fecd5c98d0 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/StoreApi.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/StoreApi.java
@@ -32,7 +32,7 @@ public interface StoreApi {
   
   @GET("/store/inventory")  
   void getInventory(
-     Callback<Map<String, Integer>> cb
+    Callback<Map<String, Integer>> cb
   ); 
   
   /**
diff --git a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java
index b17769c54e7..c74265f53fd 100644
--- a/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java
+++ b/samples/client/petstore/retrofit/src/main/java/io/swagger/client/api/UserApi.java
@@ -101,7 +101,7 @@ public interface UserApi {
   
   @GET("/user/login")  
   String loginUser(
-    @Query("username") String username,@Query("password") String password
+    @Query("username") String username, @Query("password") String password
   );
 
   /**
@@ -115,7 +115,7 @@ public interface UserApi {
   
   @GET("/user/login")  
   void loginUser(
-    @Query("username") String username,@Query("password") String password, Callback<String> cb
+    @Query("username") String username, @Query("password") String password, Callback<String> cb
   ); 
   
   /**
@@ -138,7 +138,7 @@ public interface UserApi {
   
   @GET("/user/logout")  
   void logoutUser(
-     Callback<Void> cb
+    Callback<Void> cb
   ); 
   
   /**
@@ -178,7 +178,7 @@ public interface UserApi {
   
   @PUT("/user/{username}")  
   Void updateUser(
-    @Path("username") String username,@Body User body
+    @Path("username") String username, @Body User body
   );
 
   /**
@@ -192,7 +192,7 @@ public interface UserApi {
   
   @PUT("/user/{username}")  
   void updateUser(
-    @Path("username") String username,@Body User body, Callback<Void> cb
+    @Path("username") String username, @Body User body, Callback<Void> cb
   ); 
   
   /**