Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Sebastian Spreizer <5c6139faabd2d1a0f47c422e12d78c17ec3ecea2@web.de>
babsey/nest-desktop,babsey/nest-desktop,babsey/nest-desktop,babsey/nest-desktop,babsey/nest-desktop