misc refactor
misc refactor

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