Refactor return values