Improve conditionals
Simplify conditionals