Minor changes

Newlines, spaces and && changed to ||
Changed multiline if

https://www.drupal.org/coding-standards#linelength

Untested