Removed unclear ternary operator, changed to if statements
Merge branch 'replace-automatic-routes-with-manual'

* replace-automatic-routes-with-manual:
  Removed unclear ternary operator, changed to if statements
Some changes