Remove useless else...return
Global formatting fix
Merge pull request #5779 from lucasmichot/4.2-useless-else

[4.2] Remove useless else...return
merging and fixing conflicts.