Fix ScalaStyle warnings