Made if statements consistent