Refactor away from early return