Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Billy Griffin <00d380f5ee5daa3519e8d7b8aee9870d596cc838@users.noreply.github.com>
say25/desktop,desktop/desktop,j-f1/forked-desktop,desktop/desktop,j-f1/forked-desktop,say25/desktop,artivilla/desktop,shiftkey/desktop,desktop/desktop,artivilla/desktop,say25/desktop,shiftkey/desktop,shiftkey/desktop,j-f1/forked-desktop,desktop/desktop,say25/desktop,j-f1/forked-desktop,shiftkey/desktop,artivilla/desktop,artivilla/desktop