Improve code, remove useless return type