Made if statements better