Rename and format code
Rename and format code