CLEAN COMMIT WITH ALL FIXES