CS/QA: lower nesting level

[jrfnl]

Context

• Code quality

Summary

This PR can be summarized in the following changelog entry:

• Code quality

Relevant technical choices:

If an if statement is the only content of an else clause, you may as well use an elseif.

Test instructions

Test instructions for the acceptance test before the PR gets merged

This PR can be acceptance tested by following these steps:

• If the tests pass, we should be good, but a visual/manual check for a second opinion is warranted.

[jrfnl]

Eh... why is Travis not running for this PR ?

[enricobattocchi]

Review & manual test OK! merging