Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: tidy-dev <1461e01e04d43338bd0e74c1f0f8ac6b8d625527@users.noreply.github.com>
say25/desktop,shiftkey/desktop,say25/desktop,desktop/desktop,artivilla/desktop,j-f1/forked-desktop,say25/desktop,say25/desktop,desktop/desktop,j-f1/forked-desktop,j-f1/forked-desktop,shiftkey/desktop,artivilla/desktop,shiftkey/desktop,j-f1/forked-desktop,desktop/desktop,shiftkey/desktop,artivilla/desktop,desktop/desktop,artivilla/desktop