Scala slightly more idiomatic

just 2 examples in the Scala code that stood-out as being less idiomatic than they could/should be.