Address initial review comments

* Remove usage of named returns
* Delete extraneous blank line