Reorganized and simplified code to address comments.
Reorganized and simplified code to address comments.

mattharden/vitess,dcadevil/vitess,vitessio/vitess,dumbunny/vitess,rnavarro/vitess,applift/vitess,dumbunny/vitess,yaoshengzhe/vitess,yaoshengzhe/vitess,davygeek/vitess,xgwubin/vitess,tirsen/vitess,xgwubin/vitess,erzel/vitess,yangzhongj/vitess,kuipertan/vitess,ptomasroos/vitess,AndyDiamondstein/vitess,xgwubin/vitess,dumbunny/vitess,applift/vitess,mahak/vitess,xgwubin/vitess,ptomasroos/vitess,sougou/vitess,yangzhongj/vitess,yaoshengzhe/vitess,tinyspeck/vitess,tjyang/vitess,vitessio/vitess,aaijazi/vitess,yangzhongj/vitess,yangzhongj/vitess,mapbased/vitess,pivanof/vitess,sougou/vitess,mattharden/vitess,rnavarro/vitess,rnavarro/vitess,enisoc/vitess,mattharden/vitess,erzel/vitess,alainjobart/vitess,tirsen/vitess,AndyDiamondstein/vitess,rnavarro/vitess,dumbunny/vitess,mattharden/vitess,mahak/vitess,davygeek/vitess,sougou/vitess,enisoc/vitess,applift/vitess,applift/vitess,aaijazi/vitess,tinyspeck/vitess,mahak/vitess,ptomasroos/vitess,tinyspeck/vitess,alainjobart/vitess,applift/vitess,mahak/vitess,atyenoria/vitess,yaoshengzhe/vitess,tjyang/vitess,pivanof/vitess,sougou/vitess,sougou/vitess,aaijazi/vitess,yaoshengzhe/vitess,kuipertan/vitess,mattharden/vitess,atyenoria/vitess,mahak/vitess,mapbased/vitess,pivanof/vitess,erzel/vitess,sougou/vitess,HubSpot/vitess,alainjobart/vitess,HubSpot/vitess,xgwubin/vitess,kuipertan/vitess,dumbunny/vitess,mattharden/vitess,mattharden/vitess,kuipertan/vitess,dumbunny/vitess,erzel/vitess,atyenoria/vitess,xgwubin/vitess,AndyDiamondstein/vitess,mattharden/vitess,mahak/vitess,yangzhongj/vitess,guokeno0/vitess,mapbased/vitess,guokeno0/vitess,alainjobart/vitess,enisoc/vitess,dumbunny/vitess,rnavarro/vitess,tirsen/vitess,kuipertan/vitess,atyenoria/vitess,enisoc/vitess,xgwubin/vitess,yaoshengzhe/vitess,ptomasroos/vitess,AndyDiamondstein/vitess,atyenoria/vitess,aaijazi/vitess,dcadevil/vitess,alainjobart/vitess,mahak/vitess,mapbased/vitess,aaijazi/vitess,vitessio/vitess,pivanof/vitess,HubSpot/vitess,rnavarro/vitess,alainjobart/vitess,aaijazi/vitess,alainjobart/vitess,HubSpot/vitess,yaoshengzhe/vitess,tjyang/vitess,mapbased/vitess,mapbased/vitess,HubSpot/vitess,tinyspeck/vitess,tirsen/vitess,davygeek/vitess,aaijazi/vitess,yaoshengzhe/vitess,tjyang/vitess,rnavarro/vitess,AndyDiamondstein/vitess,sougou/vitess,davygeek/vitess,atyenoria/vitess,applift/vitess,applift/vitess,erzel/vitess,dumbunny/vitess,erzel/vitess,erzel/vitess,tjyang/vitess,guokeno0/vitess,guokeno0/vitess,yangzhongj/vitess,tinyspeck/vitess,applift/vitess,mattharden/vitess,dcadevil/vitess,guokeno0/vitess,HubSpot/vitess,dumbunny/vitess,tinyspeck/vitess,tjyang/vitess,tirsen/vitess,ptomasroos/vitess,vitessio/vitess,atyenoria/vitess,kuipertan/vitess,yangzhongj/vitess,ptomasroos/vitess,dcadevil/vitess,AndyDiamondstein/vitess,tirsen/vitess,sougou/vitess,pivanof/vitess,AndyDiamondstein/vitess,tjyang/vitess,vitessio/vitess,erzel/vitess,tjyang/vitess,pivanof/vitess,dcadevil/vitess,enisoc/vitess,pivanof/vitess,vitessio/vitess,ptomasroos/vitess,xgwubin/vitess,kuipertan/vitess,pivanof/vitess,applift/vitess,applift/vitess,erzel/vitess,rnavarro/vitess,vitessio/vitess,alainjobart/vitess,dcadevil/vitess,mahak/vitess,vitessio/vitess,mapbased/vitess,davygeek/vitess,guokeno0/vitess,dcadevil/vitess,tinyspeck/vitess,mapbased/vitess,tjyang/vitess,yangzhongj/vitess,aaijazi/vitess,enisoc/vitess,enisoc/vitess,rnavarro/vitess,kuipertan/vitess,AndyDiamondstein/vitess,HubSpot/vitess,guokeno0/vitess,mattharden/vitess,yangzhongj/vitess,ptomasroos/vitess,ptomasroos/vitess,davygeek/vitess,tirsen/vitess,tirsen/vitess,mapbased/vitess,atyenoria/vitess,atyenoria/vitess,xgwubin/vitess,HubSpot/vitess,tirsen/vitess,mapbased/vitess,pivanof/vitess,AndyDiamondstein/vitess,yaoshengzhe/vitess,guokeno0/vitess,davygeek/vitess,kuipertan/vitess,dumbunny/vitess,erzel/vitess,aaijazi/vitess,guokeno0/vitess