Clean up the code with reformat