Cleaning code ++