- remove some returns as a nod towards Scala style