Scala formatting fixes