misc refactor
misc refactor

gtomitsuka/connect,khirayama/connect,qitianchan/connect,RoseTHERESA/connect,lian774739140/connect,khalerc/connect,wghust/connect,RickyDan/connect,keenwon/connect,chinazhaghai/connect,mi2oon/connect,austincitylimits/connect,dkfiresky/connect,brianloveswords/connect,llwanghong/connect,behind2/connect,davehorton/drachtio,mi2oon/connect,liuwei9413/connect,tanveer12332/connect,senchalabs/connect