Improves readability.

Condenses if statements into one line as discussed.