FIX: Cleaner conditionals