rename and code clean