Refactor about return value