Cleaning code 1