Misc refactoring
Misc refactoring

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