cleaning code, part I