Fix nested conditionals
5 files changed