diff --git a/akka-docs/scala/code/docs/camel/Consumers.scala b/akka-docs/scala/code/docs/camel/Consumers.scala
index 289936c4dd..85b46646e2 100644
--- a/akka-docs/scala/code/docs/camel/Consumers.scala
+++ b/akka-docs/scala/code/docs/camel/Consumers.scala
@@ -39,7 +39,7 @@ object Consumers {
       def endpointUri = "jms:queue:test"
 
       def receive = {
-        case msg:CamelMessage ⇒
+        case msg: CamelMessage ⇒
           sender ! Ack
           // on success
           // ..
diff --git a/akka-docs/scala/code/docs/camel/CustomRoute.scala b/akka-docs/scala/code/docs/camel/CustomRoute.scala
index ad268a0a6b..c51d3e1fc4 100644
--- a/akka-docs/scala/code/docs/camel/CustomRoute.scala
+++ b/akka-docs/scala/code/docs/camel/CustomRoute.scala
@@ -3,12 +3,11 @@ package docs.camel
 import akka.camel.CamelMessage
 import akka.actor.Status.Failure
 
-
 object CustomRoute {
   {
     //#CustomRoute
-    import akka.actor.{Props, ActorSystem, Actor, ActorRef}
-    import akka.camel.{CamelMessage, CamelExtension}
+    import akka.actor.{ Props, ActorSystem, Actor, ActorRef }
+    import akka.camel.{ CamelMessage, CamelExtension }
     import org.apache.camel.builder.RouteBuilder
     import akka.camel._
     class Responder extends Actor {
@@ -20,7 +19,7 @@ object CustomRoute {
       }
     }
 
-    class CustomRouteBuilder(system: ActorSystem, responder:ActorRef) extends RouteBuilder {
+    class CustomRouteBuilder(system: ActorSystem, responder: ActorRef) extends RouteBuilder {
       def configure {
         from("jetty:http://localhost:8877/camel/custom").to(responder)
       }
diff --git a/akka-docs/scala/code/docs/camel/CustomRouteExample.scala b/akka-docs/scala/code/docs/camel/CustomRouteExample.scala
index 96a9a7f667..15b93defaf 100644
--- a/akka-docs/scala/code/docs/camel/CustomRouteExample.scala
+++ b/akka-docs/scala/code/docs/camel/CustomRouteExample.scala
@@ -1,27 +1,26 @@
 package docs.camel
 
-
 object CustomRouteExample {
   {
     //#CustomRouteExample
-    import akka.actor.{Actor, ActorRef, Props, ActorSystem}
-    import akka.camel.{CamelMessage, Consumer, Producer, CamelExtension}
+    import akka.actor.{ Actor, ActorRef, Props, ActorSystem }
+    import akka.camel.{ CamelMessage, Consumer, Producer, CamelExtension }
     import org.apache.camel.builder.RouteBuilder
-    import org.apache.camel.{Exchange, Processor}
+    import org.apache.camel.{ Exchange, Processor }
 
     class Consumer3(transformer: ActorRef) extends Actor with Consumer {
       def endpointUri = "jetty:http://0.0.0.0:8877/camel/welcome"
 
       def receive = {
         // Forward a string representation of the message body to transformer
-        case msg: CamelMessage => transformer.forward(msg.bodyAs[String])
+        case msg: CamelMessage ⇒ transformer.forward(msg.bodyAs[String])
       }
     }
 
     class Transformer(producer: ActorRef) extends Actor {
       def receive = {
         // example: transform message body "foo" to "- foo -" and forward result to producer
-        case msg: CamelMessage => producer.forward(msg.mapBody((body: String) => "- %s -" format body))
+        case msg: CamelMessage ⇒ producer.forward(msg.mapBody((body: String) ⇒ "- %s -" format body))
       }
     }
 
diff --git a/akka-docs/scala/code/docs/camel/HttpExample.scala b/akka-docs/scala/code/docs/camel/HttpExample.scala
index d57f3707e5..55f200d5ef 100644
--- a/akka-docs/scala/code/docs/camel/HttpExample.scala
+++ b/akka-docs/scala/code/docs/camel/HttpExample.scala
@@ -5,15 +5,15 @@ object HttpExample {
   {
     //#HttpExample
     import org.apache.camel.Exchange
-    import akka.actor.{Actor, ActorRef, Props, ActorSystem}
-    import akka.camel.{Producer, CamelMessage, Consumer}
+    import akka.actor.{ Actor, ActorRef, Props, ActorSystem }
+    import akka.camel.{ Producer, CamelMessage, Consumer }
     import akka.actor.Status.Failure
 
     class HttpConsumer(producer: ActorRef) extends Consumer {
       def endpointUri = "jetty:http://0.0.0.0:8875/"
 
       def receive = {
-        case msg => producer forward msg
+        case msg ⇒ producer forward msg
       }
     }
 
@@ -21,7 +21,7 @@ object HttpExample {
       def endpointUri = "jetty://http://akka.io/?bridgeEndpoint=true"
 
       override def transformOutgoingMessage(msg: Any) = msg match {
-        case msg: CamelMessage => msg.addHeaders(msg.headers(Set(Exchange.HTTP_PATH)))
+        case msg: CamelMessage ⇒ msg.addHeaders(msg.headers(Set(Exchange.HTTP_PATH)))
       }
 
       override def routeResponse(msg: Any) { transformer forward msg }
@@ -29,8 +29,8 @@ object HttpExample {
 
     class HttpTransformer extends Actor {
       def receive = {
-        case msg: CamelMessage => sender ! (msg.mapBody {body: String => body replaceAll ("Akka ", "AKKA ")})
-        case msg: Failure => sender ! msg
+        case msg: CamelMessage ⇒ sender ! (msg.mapBody { body: String ⇒ body replaceAll ("Akka ", "AKKA ") })
+        case msg: Failure      ⇒ sender ! msg
       }
     }
 
diff --git a/akka-docs/scala/code/docs/camel/Introduction.scala b/akka-docs/scala/code/docs/camel/Introduction.scala
index 92ddccfc51..3c9561d22c 100644
--- a/akka-docs/scala/code/docs/camel/Introduction.scala
+++ b/akka-docs/scala/code/docs/camel/Introduction.scala
@@ -1,6 +1,6 @@
 package docs.camel
 
-import akka.actor.{Props, ActorSystem}
+import akka.actor.{ Props, ActorSystem }
 import akka.camel.CamelExtension
 
 object Introduction {
@@ -89,14 +89,14 @@ object Introduction {
     val camel = CamelExtension(system)
     val actorRef = system.actorOf(Props[MyEndpoint])
     // get a future reference to the activation of the endpoint of the Consumer Actor
-    val activationFuture = camel.activationFutureFor(actorRef,10 seconds)
+    val activationFuture = camel.activationFutureFor(actorRef, 10 seconds)
     // or, block wait on the activation
     camel.awaitActivation(actorRef, 10 seconds)
     //#CamelActivation
     //#CamelDeactivation
     system.stop(actorRef)
     // get a future reference to the deactivation of the endpoint of the Consumer Actor
-    val deactivationFuture = camel.activationFutureFor(actorRef,10 seconds)
+    val deactivationFuture = camel.activationFutureFor(actorRef, 10 seconds)
     // or, block wait on the deactivation
     camel.awaitDeactivation(actorRef, 10 seconds)
     //#CamelDeactivation
diff --git a/akka-docs/scala/code/docs/camel/Producers.scala b/akka-docs/scala/code/docs/camel/Producers.scala
index 5229f83914..58ee243d7b 100644
--- a/akka-docs/scala/code/docs/camel/Producers.scala
+++ b/akka-docs/scala/code/docs/camel/Producers.scala
@@ -6,8 +6,8 @@ object Producers {
   {
     //#Producer1
     import akka.actor.Actor
-    import akka.actor.{Props, ActorSystem}
-    import akka.camel.{Producer, CamelMessage}
+    import akka.actor.{ Props, ActorSystem }
+    import akka.camel.{ Producer, CamelMessage }
     import akka.util.Timeout
 
     class Producer1 extends Actor with Producer {
@@ -26,14 +26,14 @@ object Producers {
   }
   {
     //#RouteResponse
-    import akka.actor.{Actor, ActorRef}
-    import akka.camel.{Producer, CamelMessage}
-    import akka.actor.{Props, ActorSystem}
+    import akka.actor.{ Actor, ActorRef }
+    import akka.camel.{ Producer, CamelMessage }
+    import akka.actor.{ Props, ActorSystem }
 
     class ResponseReceiver extends Actor {
       def receive = {
-        case msg:CamelMessage ⇒
-          // do something with the forwarded response
+        case msg: CamelMessage ⇒
+        // do something with the forwarded response
       }
     }
 
@@ -44,7 +44,7 @@ object Producers {
     }
     val system = ActorSystem("some-system")
     val receiver = system.actorOf(Props[ResponseReceiver])
-    val forwardResponse = system.actorOf(Props(new Forwarder("http://localhost:8080/news/akka",receiver)))
+    val forwardResponse = system.actorOf(Props(new Forwarder("http://localhost:8080/news/akka", receiver)))
     // the Forwarder sends out a request to the web page and forwards the response to
     // the ResponseReceiver
     forwardResponse ! "some request"
@@ -53,12 +53,12 @@ object Producers {
   {
     //#TransformOutgoingMessage
     import akka.actor.Actor
-    import akka.camel.{Producer, CamelMessage}
+    import akka.camel.{ Producer, CamelMessage }
 
     class Transformer(uri: String) extends Actor with Producer {
       def endpointUri = uri
 
-      def upperCase(msg:CamelMessage) = msg.mapBody {
+      def upperCase(msg: CamelMessage) = msg.mapBody {
         body: String ⇒ body.toUpperCase
       }
 
@@ -70,10 +70,10 @@ object Producers {
   }
   {
     //#Oneway
-    import akka.actor.{Actor, Props, ActorSystem}
+    import akka.actor.{ Actor, Props, ActorSystem }
     import akka.camel.Producer
 
-    class OnewaySender(uri:String) extends Actor with Producer {
+    class OnewaySender(uri: String) extends Actor with Producer {
       def endpointUri = uri
       override def oneway: Boolean = true
     }
@@ -86,9 +86,9 @@ object Producers {
   }
   {
     //#Correlate
-    import akka.camel.{Producer, CamelMessage}
+    import akka.camel.{ Producer, CamelMessage }
     import akka.actor.Actor
-    import akka.actor.{Props, ActorSystem}
+    import akka.actor.{ Props, ActorSystem }
 
     class Producer2 extends Actor with Producer {
       def endpointUri = "activemg:FOO.BAR"
@@ -103,11 +103,11 @@ object Producers {
     //#ProducerTemplate
     import akka.actor.Actor
     class MyActor extends Actor {
-       def receive = {
-         case msg ⇒
-           val template = CamelExtension(context.system).template
-           template.sendBody("direct:news", msg)
-       }
+      def receive = {
+        case msg ⇒
+          val template = CamelExtension(context.system).template
+          template.sendBody("direct:news", msg)
+      }
     }
     //#ProducerTemplate
   }
diff --git a/akka-docs/scala/code/docs/camel/PublishSubscribe.scala b/akka-docs/scala/code/docs/camel/PublishSubscribe.scala
index ab604b44dd..430fcdbb3e 100644
--- a/akka-docs/scala/code/docs/camel/PublishSubscribe.scala
+++ b/akka-docs/scala/code/docs/camel/PublishSubscribe.scala
@@ -1,17 +1,16 @@
 package docs.camel
 
-
 object PublishSubscribe {
   {
     //#PubSub
-    import akka.actor.{Actor, ActorRef, ActorSystem, Props}
-    import akka.camel.{Producer, CamelMessage, Consumer}
+    import akka.actor.{ Actor, ActorRef, ActorSystem, Props }
+    import akka.camel.{ Producer, CamelMessage, Consumer }
 
-    class Subscriber(name:String, uri: String) extends Actor with Consumer {
+    class Subscriber(name: String, uri: String) extends Actor with Consumer {
       def endpointUri = uri
 
-      protected def receive = {
-        case msg: CamelMessage => println("%s received: %s" format (name, msg.body))
+      def receive = {
+        case msg: CamelMessage ⇒ println("%s received: %s" format (name, msg.body))
       }
     }
 
@@ -26,8 +25,8 @@ object PublishSubscribe {
     class PublisherBridge(uri: String, publisher: ActorRef) extends Actor with Consumer {
       def endpointUri = uri
 
-      protected def receive = {
-        case msg: CamelMessage => {
+      def receive = {
+        case msg: CamelMessage ⇒ {
           publisher ! msg.bodyAs[String]
           sender ! ("message published")
         }
@@ -40,7 +39,7 @@ object PublishSubscribe {
     val jmsUri = "jms:topic:test"
     val jmsSubscriber1 = system.actorOf(Props(new Subscriber("jms-subscriber-1", jmsUri)))
     val jmsSubscriber2 = system.actorOf(Props(new Subscriber("jms-subscriber-2", jmsUri)))
-    val jmsPublisher   = system.actorOf(Props(new Publisher("jms-publisher", jmsUri)))
+    val jmsPublisher = system.actorOf(Props(new Publisher("jms-publisher", jmsUri)))
     val jmsPublisherBridge = system.actorOf(Props(new PublisherBridge("jetty:http://0.0.0.0:8877/camel/pub/jms", jmsPublisher)))
     //#PubSub
 
diff --git a/akka-docs/scala/code/docs/camel/QuartzExample.scala b/akka-docs/scala/code/docs/camel/QuartzExample.scala
index b25e38630c..2735511d3c 100644
--- a/akka-docs/scala/code/docs/camel/QuartzExample.scala
+++ b/akka-docs/scala/code/docs/camel/QuartzExample.scala
@@ -1,13 +1,12 @@
 package docs.camel
 
-
 object QuartzExample {
 
   {
     //#Quartz
-    import akka.actor.{ActorSystem, Props}
+    import akka.actor.{ ActorSystem, Props }
 
-    import akka.camel.{Consumer}
+    import akka.camel.{ Consumer }
 
     class MyQuartzActor extends Consumer {
 
@@ -15,7 +14,7 @@ object QuartzExample {
 
       def receive = {
 
-        case msg => println("==============> received %s " format msg)
+        case msg ⇒ println("==============> received %s " format msg)
 
       } // end receive