Apply suggestions from code review
Apply suggestions from code review

Co-Authored-By: Billy Griffin <00d380f5ee5daa3519e8d7b8aee9870d596cc838@users.noreply.github.com>
Co-Authored-By: Neha Batra <8fe40a3ce0b8bd30de7a7b707d9d92a9d38b91b7@github.com>
say25/desktop,desktop/desktop,say25/desktop,shiftkey/desktop,say25/desktop,desktop/desktop,shiftkey/desktop,artivilla/desktop,artivilla/desktop,j-f1/forked-desktop,artivilla/desktop,kactus-io/kactus,shiftkey/desktop,kactus-io/kactus,desktop/desktop,shiftkey/desktop,desktop/desktop,j-f1/forked-desktop,say25/desktop,j-f1/forked-desktop,kactus-io/kactus,artivilla/desktop,j-f1/forked-desktop,kactus-io/kactus