Cleanup
Clean and fix