Merge pull request #5367 from carusogabriel/clean-elses

Clean elses
8 files changed