rename and delete some codes