#2 cleaning code