Cleaning code modified