Apply suggestions from code review
Apply suggestions from code review

Co-authored-by: Markus Olsson <fea8a6992108b6bfda0c59222a1afb2da2ede904@gmail.com>
shiftkey/desktop,shiftkey/desktop,desktop/desktop,desktop/desktop,shiftkey/desktop,desktop/desktop,desktop/desktop,shiftkey/desktop