Cleaning code..