ScalaStyle warnings fixed