Refactor: User if with return