Cleanup and format