opti + clean + fix