Changed if flag for cleanliness