minor refactoring

What does this MR do?

refactors little things regarding control flow all over the project.

How confident are you it won't break things if deployed?

Very

Checklist

• added a test, or explain why one is not needed/possible... (refactor only)
• no unrelated changes
• asked someone for a code review
• joined #foodsharing-beta channel at https://slackin.yunity.org
• added an entry to CHANGELOG.md (description, merge request link, username(s))