rename and code format