Improve Scala-ness