Cleaning code 2