diff --git a/bagel/src/test/scala/bagel/BagelSuite.scala b/bagel/src/test/scala/bagel/BagelSuite.scala
index 5ac7f5d381b22244fcdc192bf3a9d4a65718be09..d2189169d23c2136f8c0e0a6be012a5e07cf695d 100644
--- a/bagel/src/test/scala/bagel/BagelSuite.scala
+++ b/bagel/src/test/scala/bagel/BagelSuite.scala
@@ -13,11 +13,11 @@ import spark._
 class TestVertex(val active: Boolean, val age: Int) extends Vertex with Serializable
 class TestMessage(val targetId: String) extends Message[String] with Serializable
 
-class BagelSuite extends FunSuite with Assertions with BeforeAndAfter{
+class BagelSuite extends FunSuite with Assertions with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
+  after {
     sc.stop()
   }
   
diff --git a/core/src/main/scala/spark/broadcast/Broadcast.scala b/core/src/main/scala/spark/broadcast/Broadcast.scala
index 06049749a91702593aac42f36b46800e9de42f66..07094a034ebb19ad1a8b564a6c2e889914f5ecce 100644
--- a/core/src/main/scala/spark/broadcast/Broadcast.scala
+++ b/core/src/main/scala/spark/broadcast/Broadcast.scala
@@ -175,7 +175,7 @@ object Broadcast extends Logging with Serializable {
   }
 
   private def byteArrayToObject[OUT](bytes: Array[Byte]): OUT = {
-    val in = new ObjectInputStream (new ByteArrayInputStream (bytes)){
+    val in = new ObjectInputStream (new ByteArrayInputStream (bytes)) {
       override def resolveClass(desc: ObjectStreamClass) =
         Class.forName(desc.getName, false, Thread.currentThread.getContextClassLoader)
     }    
diff --git a/core/src/test/scala/spark/BroadcastSuite.scala b/core/src/test/scala/spark/BroadcastSuite.scala
index d22c2d4295e01933243e2719c2e0df9a5fe716fe..1e0b587421b904d3c161d68589c83eec5eca6651 100644
--- a/core/src/test/scala/spark/BroadcastSuite.scala
+++ b/core/src/test/scala/spark/BroadcastSuite.scala
@@ -7,8 +7,8 @@ class BroadcastSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }
diff --git a/core/src/test/scala/spark/FailureSuite.scala b/core/src/test/scala/spark/FailureSuite.scala
index 622628336175eac4caf9d264aa9fb5e70a8f5d68..6145baee7b7d9e509ab13e3ee49fef11ada6abd4 100644
--- a/core/src/test/scala/spark/FailureSuite.scala
+++ b/core/src/test/scala/spark/FailureSuite.scala
@@ -25,8 +25,8 @@ class FailureSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
     
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }
diff --git a/core/src/test/scala/spark/FileSuite.scala b/core/src/test/scala/spark/FileSuite.scala
index 3a77ed0f13c15d664279ad7bd2cdc0b86fba8fc5..4cb9c7802f8686679e0cb3405d3dc1bdebbf1b20 100644
--- a/core/src/test/scala/spark/FileSuite.scala
+++ b/core/src/test/scala/spark/FileSuite.scala
@@ -11,12 +11,12 @@ import org.apache.hadoop.io._
 
 import SparkContext._
 
-class FileSuite extends FunSuite with BeforeAndAfter{
+class FileSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }
diff --git a/core/src/test/scala/spark/MesosSchedulerSuite.scala b/core/src/test/scala/spark/MesosSchedulerSuite.scala
index 0e6820cbdcf31b0135d57283ef6b2b78681a5569..2f1bea58b511ea42e5c9db95607e54f58fb1e3a1 100644
--- a/core/src/test/scala/spark/MesosSchedulerSuite.scala
+++ b/core/src/test/scala/spark/MesosSchedulerSuite.scala
@@ -3,7 +3,7 @@ package spark
 import org.scalatest.FunSuite
 
 class MesosSchedulerSuite extends FunSuite {
-  test("memoryStringToMb"){
+  test("memoryStringToMb") {
 
     assert(MesosScheduler.memoryStringToMb("1") == 0)
     assert(MesosScheduler.memoryStringToMb("1048575") == 0)
diff --git a/core/src/test/scala/spark/PartitioningSuite.scala b/core/src/test/scala/spark/PartitioningSuite.scala
index dfe6a295c8cff43f2b20cfd23106f7eb03093f84..cf2ffeb9b1a131267936ec523d4d38c2476ee8ff 100644
--- a/core/src/test/scala/spark/PartitioningSuite.scala
+++ b/core/src/test/scala/spark/PartitioningSuite.scala
@@ -11,8 +11,8 @@ class PartitioningSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }
diff --git a/core/src/test/scala/spark/PipedRDDSuite.scala b/core/src/test/scala/spark/PipedRDDSuite.scala
index c0cf034c7278b4fcb1d58d176bd28a0af910bb9f..db1b9835a0299b6960a503cb343db20619f0beb4 100644
--- a/core/src/test/scala/spark/PipedRDDSuite.scala
+++ b/core/src/test/scala/spark/PipedRDDSuite.scala
@@ -8,8 +8,8 @@ class PipedRDDSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }
diff --git a/core/src/test/scala/spark/RDDSuite.scala b/core/src/test/scala/spark/RDDSuite.scala
index 1d240b471f59fc34f08994ec501671a2023b9456..3924a6890befcbbe28c650e1d4f22dd8d01784f4 100644
--- a/core/src/test/scala/spark/RDDSuite.scala
+++ b/core/src/test/scala/spark/RDDSuite.scala
@@ -5,12 +5,12 @@ import org.scalatest.FunSuite
 import org.scalatest.BeforeAndAfter
 import SparkContext._
 
-class RDDSuite extends FunSuite with BeforeAndAfter{
+class RDDSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }
diff --git a/core/src/test/scala/spark/ShuffleSuite.scala b/core/src/test/scala/spark/ShuffleSuite.scala
index aca286f3add2c8a392dfb951ee5acddbfb95e7ae..3ba0e274b738e57437c2c409197a6ecccc92e327 100644
--- a/core/src/test/scala/spark/ShuffleSuite.scala
+++ b/core/src/test/scala/spark/ShuffleSuite.scala
@@ -17,8 +17,8 @@ class ShuffleSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }
diff --git a/core/src/test/scala/spark/SortingSuite.scala b/core/src/test/scala/spark/SortingSuite.scala
index ced3c66d38f01c8b7367a71baa4f6977619fdd57..d2dd514edbaf0957029117c41a516a28e8e02b77 100644
--- a/core/src/test/scala/spark/SortingSuite.scala
+++ b/core/src/test/scala/spark/SortingSuite.scala
@@ -8,8 +8,8 @@ class SortingSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }
diff --git a/core/src/test/scala/spark/ThreadingSuite.scala b/core/src/test/scala/spark/ThreadingSuite.scala
index 6126883a21e7791b4fb53aa44e9f4d493a13c924..a8b5ccf721511904a09831cb1e2848a33e46f7a5 100644
--- a/core/src/test/scala/spark/ThreadingSuite.scala
+++ b/core/src/test/scala/spark/ThreadingSuite.scala
@@ -26,8 +26,8 @@ class ThreadingSuite extends FunSuite with BeforeAndAfter {
   
   var sc: SparkContext = _
   
-  after{
-    if(sc != null){
+  after {
+    if(sc != null) {
       sc.stop()
     }
   }