diff --git a/akka-persistence/akka-persistence-common/src/main/scala/KVStorageBackend.scala b/akka-persistence/akka-persistence-common/src/main/scala/KVStorageBackend.scala
index 5ca103046c..25c1b0b1f1 100644
--- a/akka-persistence/akka-persistence-common/src/main/scala/KVStorageBackend.scala
+++ b/akka-persistence/akka-persistence-common/src/main/scala/KVStorageBackend.scala
@@ -45,7 +45,7 @@ private[akka] trait KVStorageBackend extends MapStorageBackend[Array[Byte], Arra
   val vectorSizeIndex = getIndexedBytes(-1)
   val queueHeadIndex = getIndexedBytes(-1)
   val queueTailIndex = getIndexedBytes(-2)
-  //explicit implicit :)
+
   implicit val ordering = ArrayOrdering
   import KVAccess._
 
diff --git a/akka-persistence/akka-persistence-riak/src/main/scala/RiakStorageBackend.scala b/akka-persistence/akka-persistence-riak/src/main/scala/RiakStorageBackend.scala
index 98b3a416cb..0e77451a58 100644
--- a/akka-persistence/akka-persistence-riak/src/main/scala/RiakStorageBackend.scala
+++ b/akka-persistence/akka-persistence-riak/src/main/scala/RiakStorageBackend.scala
@@ -25,9 +25,24 @@ private[akka] object RiakStorageBackend extends KVStorageBackend {
   val clientHost = config.getString("akka.storage.riak.client.host", "localhost")
   val clientPort = config.getInt("akka.storage.riak.client.port", 8087)
   val riakClient: RiakClient = new RiakClient(clientHost, clientPort);
+
   import KVAccess._
   import RiakAccess._
 
+
+  val refs = new RiakAccess(refBucket)
+  val maps = new RiakAccess(mapBucket)
+  val vectors = new RiakAccess(vectorBucket)
+  val queues = new RiakAccess(queueBucket)
+
+  def refAccess = refs
+
+  def mapAccess = maps
+
+  def vectorAccess = vectors
+
+  def queueAccess = queues
+
   object RiakAccess {
     implicit def byteArrayToByteString(ary: Array[Byte]): ByteString = {
       ByteString.copyFrom(ary)
@@ -79,7 +94,7 @@ private[akka] object RiakStorageBackend extends KVStorageBackend {
 
     def getAll(keys: Iterable[Array[Byte]]): Map[Array[Byte], Array[Byte]] = {
       var result = new HashMap[Array[Byte], Array[Byte]]
-      keys.foreach {
+      keys.foreach{
         key =>
           val value = getValue(key)
           Option(value) match {
@@ -103,18 +118,5 @@ private[akka] object RiakStorageBackend extends KVStorageBackend {
     }
   }
 
-  val refs = new RiakAccess(refBucket)
-  val maps = new RiakAccess(mapBucket)
-  val vectors = new RiakAccess(vectorBucket)
-  val queues = new RiakAccess(queueBucket)
-
-  def refAccess = refs
-
-  def mapAccess = maps
-
-  def vectorAccess = vectors
-
-  def queueAccess = queues
-
 
 }
\ No newline at end of file