Scala niceties cleanup