++ Cleaning code