Tidy up conditionals