ScalaStyle corrections