Rename and remove useless comment