cleanup based on previous code review
cleanup based on previous code review

shiftkey/desktop,hjobrien/desktop,desktop/desktop,artivilla/desktop,say25/desktop,hjobrien/desktop,kactus-io/kactus,BugTesterTest/desktops,gengjiawen/desktop,say25/desktop,j-f1/forked-desktop,desktop/desktop,BugTesterTest/desktops,shiftkey/desktop,hjobrien/desktop,artivilla/desktop,artivilla/desktop,artivilla/desktop,say25/desktop,kactus-io/kactus,shiftkey/desktop,j-f1/forked-desktop,j-f1/forked-desktop,desktop/desktop,gengjiawen/desktop,gengjiawen/desktop,BugTesterTest/desktops,kactus-io/kactus,say25/desktop,gengjiawen/desktop,hjobrien/desktop,kactus-io/kactus,shiftkey/desktop,desktop/desktop,BugTesterTest/desktops,j-f1/forked-desktop