Cleaning if statement