Scala style fixes