Converted more Java code to Scala