diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/Implicits.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/Implicits.scala
index 9fa48ca..5223b47 100644
--- a/cucumber-scala/src/main/scala/io/cucumber/scala/Implicits.scala
+++ b/cucumber-scala/src/main/scala/io/cucumber/scala/Implicits.scala
@@ -22,7 +22,7 @@ object Implicits {
       * `.asMaps[K,V](classOf[K], classOf[V])` but returned as Scala collection
       * types without `null` values.
       *
-      * See also `asScalaRawMaps[T]` if you don't need `Option`s (for instance
+      * See also `asScalaRawMaps[T]` if you don't need `Option` s (for instance
       * if you are using a DataTableType).
       *
       * @tparam K
@@ -104,7 +104,7 @@ object Implicits {
       * `.asLists[T](classOf[T])` but returned as Scala collection types without
       * `null` values.
       *
-      * See also `asScalaRawLists[T]` if you don't need `Option`s (for instance
+      * See also `asScalaRawLists[T]` if you don't need `Option` s (for instance
       * if you are using a DataTableType).
       *
       * @tparam T
@@ -150,7 +150,7 @@ object Implicits {
       * of `.asList[T](classOf[T])` but returned as Scala collection types
       * without `null` values.
       *
-      * See also `asScalaRawList[T]` if you don't need `Option`s (for instance
+      * See also `asScalaRawList[T]` if you don't need `Option` s (for instance
       * if you are using a DataTableType).
       *
       * @tparam T
diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/JacksonDefaultDataTableEntryTransformer.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/JacksonDefaultDataTableEntryTransformer.scala
index 0c8b435..2296505 100644
--- a/cucumber-scala/src/main/scala/io/cucumber/scala/JacksonDefaultDataTableEntryTransformer.scala
+++ b/cucumber-scala/src/main/scala/io/cucumber/scala/JacksonDefaultDataTableEntryTransformer.scala
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.module.scala.DefaultScalaModule
 
 /** <p>This trait register a `DefaultDataTableEntryTransformer` using Jackson
-  * `ObjectMapper`.</p>
+  * `ObjectMapper`. </p>
   *
   * <p>The `[empty]` string is used as default empty string replacement. You can
   * override it if you need to.</p>
diff --git a/cucumber-scala/src/main/scala/io/cucumber/scala/Stepable.scala b/cucumber-scala/src/main/scala/io/cucumber/scala/Stepable.scala
index 332e398..c14a232 100644
--- a/cucumber-scala/src/main/scala/io/cucumber/scala/Stepable.scala
+++ b/cucumber-scala/src/main/scala/io/cucumber/scala/Stepable.scala
@@ -14,18 +14,29 @@ trait Stepable[T] {
 
 object Stepable {
 
-  implicit def stepable9[T[
-      _,
-      _,
-      _,
-      _,
-      _,
-      _,
-      _,
-      _,
-      _
-  ], X1: Stepable, X2: Stepable, X3: Stepable, X4: Stepable, X5: Stepable, X6: Stepable, X7: Stepable, X8: Stepable, X9: Stepable](
-      implicit ct: ClassTag[T[X1, X2, X3, X4, X5, X6, X7, X8, X9]]
+  implicit def stepable9[
+      T[
+          _,
+          _,
+          _,
+          _,
+          _,
+          _,
+          _,
+          _,
+          _
+      ],
+      X1: Stepable,
+      X2: Stepable,
+      X3: Stepable,
+      X4: Stepable,
+      X5: Stepable,
+      X6: Stepable,
+      X7: Stepable,
+      X8: Stepable,
+      X9: Stepable
+  ](implicit
+      ct: ClassTag[T[X1, X2, X3, X4, X5, X6, X7, X8, X9]]
   ): Stepable[T[X1, X2, X3, X4, X5, X6, X7, X8, X9]] =
     new Stepable[T[X1, X2, X3, X4, X5, X6, X7, X8, X9]] {
       def asJavaType: JavaType =
@@ -45,17 +56,27 @@ object Stepable {
         )
     }
 
-  implicit def stepable8[T[
-      _,
-      _,
-      _,
-      _,
-      _,
-      _,
-      _,
-      _
-  ], X1: Stepable, X2: Stepable, X3: Stepable, X4: Stepable, X5: Stepable, X6: Stepable, X7: Stepable, X8: Stepable](
-      implicit ct: ClassTag[T[X1, X2, X3, X4, X5, X6, X7, X8]]
+  implicit def stepable8[
+      T[
+          _,
+          _,
+          _,
+          _,
+          _,
+          _,
+          _,
+          _
+      ],
+      X1: Stepable,
+      X2: Stepable,
+      X3: Stepable,
+      X4: Stepable,
+      X5: Stepable,
+      X6: Stepable,
+      X7: Stepable,
+      X8: Stepable
+  ](implicit
+      ct: ClassTag[T[X1, X2, X3, X4, X5, X6, X7, X8]]
   ): Stepable[T[X1, X2, X3, X4, X5, X6, X7, X8]] =
     new Stepable[T[X1, X2, X3, X4, X5, X6, X7, X8]] {
       def asJavaType: JavaType =
@@ -74,16 +95,25 @@ object Stepable {
         )
     }
 
-  implicit def stepable7[T[
-      _,
-      _,
-      _,
-      _,
-      _,
-      _,
-      _
-  ], X1: Stepable, X2: Stepable, X3: Stepable, X4: Stepable, X5: Stepable, X6: Stepable, X7: Stepable](
-      implicit ct: ClassTag[T[X1, X2, X3, X4, X5, X6, X7]]
+  implicit def stepable7[
+      T[
+          _,
+          _,
+          _,
+          _,
+          _,
+          _,
+          _
+      ],
+      X1: Stepable,
+      X2: Stepable,
+      X3: Stepable,
+      X4: Stepable,
+      X5: Stepable,
+      X6: Stepable,
+      X7: Stepable
+  ](implicit
+      ct: ClassTag[T[X1, X2, X3, X4, X5, X6, X7]]
   ): Stepable[T[X1, X2, X3, X4, X5, X6, X7]] =
     new Stepable[T[X1, X2, X3, X4, X5, X6, X7]] {
       def asJavaType: JavaType =
@@ -101,15 +131,23 @@ object Stepable {
         )
     }
 
-  implicit def stepable6[T[
-      _,
-      _,
-      _,
-      _,
-      _,
-      _
-  ], X1: Stepable, X2: Stepable, X3: Stepable, X4: Stepable, X5: Stepable, X6: Stepable](
-      implicit ct: ClassTag[T[X1, X2, X3, X4, X5, X6]]
+  implicit def stepable6[
+      T[
+          _,
+          _,
+          _,
+          _,
+          _,
+          _
+      ],
+      X1: Stepable,
+      X2: Stepable,
+      X3: Stepable,
+      X4: Stepable,
+      X5: Stepable,
+      X6: Stepable
+  ](implicit
+      ct: ClassTag[T[X1, X2, X3, X4, X5, X6]]
   ): Stepable[T[X1, X2, X3, X4, X5, X6]] =
     new Stepable[T[X1, X2, X3, X4, X5, X6]] {
       def asJavaType: JavaType =