Refactor named returns