Clean up
Reformat