Continued conversion to Scala