Rename and format the code