clean + fix bug