Group conditionals properly