Refactoring, using ScalaUtils.option
- per @ebruchez's suggestion