misc refactoring
misc refactoring

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