Scala style changes.