Variable name change, remove useless return