Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Rafael Oleza <2cf5b502deae2e387c60721eb8244c243cb5c4e1@github.com>
kactus-io/kactus,kactus-io/kactus,shiftkey/desktop,artivilla/desktop,shiftkey/desktop,say25/desktop,artivilla/desktop,shiftkey/desktop,kactus-io/kactus,shiftkey/desktop,say25/desktop,j-f1/forked-desktop,desktop/desktop,j-f1/forked-desktop,kactus-io/kactus,artivilla/desktop,artivilla/desktop,j-f1/forked-desktop,desktop/desktop,say25/desktop,j-f1/forked-desktop,say25/desktop,desktop/desktop,desktop/desktop