clean + fix