more conditionals, neater

neater conditional