Cleaning code #2