Clean up
Formatting