Fix and homogenize indentation and use of whitespace
Clarify operator precedence in logical expression
Homogenize whitespace use and indentation