Addressing reviewers comments: Scala style