Minor cleanup for Scala style