More scala-like. [ci skip]