More Scala code