Refactor Return Statement