Tidy some conditionals