cleaning code correctly