Cleanup
Cleanup and format