Cleanup
Formatting