Avoid ambiguous conditional syntax
Don't break up short lines