Cleaning code #342