Cleaning code (booleans)