core: re-arrange some code to make things easier to read later
core: re-arrange some code to make things easier to read later

theist/vagrant,jkburges/vagrant,jberends/vagrant,modulexcite/vagrant,rivy/vagrant,blueyed/vagrant,sax/vagrant,bdwyertech/vagrant,mitchellh/vagrant,kalabiyau/vagrant,channui/vagrant,chrisroberts/vagrant,TheBigBear/vagrant,patrys/vagrant,loren-osborn/vagrant,invernizzi-at-google/vagrant,loren-osborn/vagrant,carlosefr/vagrant,doy/vagrant,mwarren/vagrant,otagi/vagrant,mwrock/vagrant,taliesins/vagrant,tknerr/vagrant,gajdaw/vagrant,Chhunlong/vagrant,BlakeMesdag/vagrant,bshurts/vagrant,p0deje/vagrant,zsjohny/vagrant,Chhed13/vagrant,kamigerami/vagrant,zsjohny/vagrant,bshurts/vagrant,mpoeter/vagrant,Avira/vagrant,mwarren/vagrant,PatOShea/vagrant,tbarrongh/vagrant,tomfanning/vagrant,gitebra/vagrant,Endika/vagrant,fnewberg/vagrant,genome21/vagrant,justincampbell/vagrant,chrisvire/vagrant,vamegh/vagrant,lukebakken/vagrant,sax/vagrant,jtopper/vagrant,Endika/vagrant,aneeshusa/vagrant,krig/vagrant,johntron/vagrant,invernizzi-at-google/vagrant,darkn3rd/vagrant,kamazee/vagrant,marxarelli/vagrant,juiceinc/vagrant,sax/vagrant,mwrock/vagrant,rivy/vagrant,mwarren/vagrant,teotihuacanada/vagrant,crashlytics/vagrant,wangfakang/vagrant,teotihuacanada/vagrant,tbarrongh/vagrant,taliesins/vagrant,sideci-sample/sideci-sample-vagrant,doy/vagrant,shtouff/vagrant,philoserf/vagrant,mitchellh/vagrant,Chhed13/vagrant,jkburges/vagrant,muhanadra/vagrant,shtouff/vagrant,otagi/vagrant,TheBigBear/vagrant,tbarrongh/vagrant,fnewberg/vagrant,tbriggs-curse/vagrant,miguel250/vagrant,johntron/vagrant,senglin/vagrant,bshurts/vagrant,miguel250/vagrant,tjanez/vagrant,jtopper/vagrant,jean/vagrant,clinstid/vagrant,krig/vagrant,dhoer/vagrant,jean/vagrant,benh57/vagrant,bheuvel/vagrant,iNecas/vagrant,PatOShea/vagrant,obnoxxx/vagrant,nickryand/vagrant,PatOShea/vagrant,genome21/vagrant,modulexcite/vagrant,bheuvel/vagrant,dharmab/vagrant,dharmab/vagrant,gbarberi/vagrant,jmanero/vagrant,miguel250/vagrant,myrjola/vagrant,mwarren/vagrant,gajdaw/vagrant,philoserf/vagrant,sideci-sample/sideci-sample-vagrant,muhanadra/vagrant,obnoxxx/vagrant,aaam/vagrant,tomfanning/vagrant,evverx/vagrant,signed8bit/vagrant,h4ck3rm1k3/vagrant,cgvarela/vagrant,obnoxxx/vagrant,janek-warchol/vagrant,dustymabe/vagrant,apertoso/vagrant,benh57/vagrant,mkuzmin/vagrant,mpoeter/vagrant,blueyed/vagrant,apertoso/vagrant,myrjola/vagrant,sni/vagrant,pwnall/vagrant,krig/vagrant,blueyed/vagrant,jfchevrette/vagrant,juiceinc/vagrant,tjanez/vagrant,nickryand/vagrant,BlakeMesdag/vagrant,Sgoettschkes/vagrant,miguel250/vagrant,aneeshusa/vagrant,rivy/vagrant,sferik/vagrant,pwnall/vagrant,bryson/vagrant,petems/vagrant,patrys/vagrant,jberends/vagrant,sideci-sample/sideci-sample-vagrant,shtouff/vagrant,dhoer/vagrant,lonniev/vagrant,ferventcoder/vagrant,gbarberi/vagrant,benh57/vagrant,philwrenn/vagrant,darkn3rd/vagrant,gitebra/vagrant,myrjola/vagrant,ferventcoder/vagrant,otagi/vagrant,PatrickLang/vagrant,clinstid/vagrant,iNecas/vagrant,modulexcite/vagrant,jmanero/vagrant,chrisvire/vagrant,wangfakang/vagrant,denisbr/vagrant,stephancom/vagrant,nickryand/vagrant,bryson/vagrant,lukebakken/vagrant,johntron/vagrant,jhoblitt/vagrant,teotihuacanada/vagrant,ferventcoder/vagrant,ArloL/vagrant,tschortsch/vagrant,jhoblitt/vagrant,evverx/vagrant,senglin/vagrant,gpkfr/vagrant,ianmiell/vagrant,dustymabe/vagrant,petems/vagrant,lonniev/vagrant,p0deje/vagrant,legal90/vagrant,ArloL/vagrant,theist/vagrant,mkuzmin/vagrant,tschortsch/vagrant,MiLk/vagrant,pwnall/vagrant,bheuvel/vagrant,patrys/vagrant,invernizzi-at-google/vagrant,gpkfr/vagrant,ferventcoder/vagrant,kamazee/vagrant,theist/vagrant,cgvarela/vagrant,benizi/vagrant,iNecas/vagrant,aneeshusa/vagrant,gajdaw/vagrant,janek-warchol/vagrant,PatrickLang/vagrant,dhoer/vagrant,justincampbell/vagrant,bryson/vagrant,PatOShea/vagrant,tbarrongh/vagrant,dustymabe/vagrant,Chhed13/vagrant,modulexcite/vagrant,bdwyertech/vagrant,h4ck3rm1k3/vagrant,ianmiell/vagrant,chrisroberts/vagrant,aaam/vagrant,denisbr/vagrant,jmanero/vagrant,TheBigBear/vagrant,jhoblitt/vagrant,petems/vagrant,bheuvel/vagrant,gitebra/vagrant,otagi/vagrant,genome21/vagrant,MiLk/vagrant,bdwyertech/vagrant,jfchevrette/vagrant,gitebra/vagrant,rivy/vagrant,jhoblitt/vagrant,benizi/vagrant,bshurts/vagrant,patrys/vagrant,janek-warchol/vagrant,mkuzmin/vagrant,justincampbell/vagrant,darkn3rd/vagrant,clinstid/vagrant,Endika/vagrant,muhanadra/vagrant,legal90/vagrant,tbriggs-curse/vagrant,shtouff/vagrant,sferik/vagrant,wkolean/vagrant,gbarberi/vagrant,kamigerami/vagrant,ArloL/vagrant,Endika/vagrant,kalabiyau/vagrant,kamigerami/vagrant,sni/vagrant,PatrickLang/vagrant,carlosefr/vagrant,mkuzmin/vagrant,apertoso/vagrant,jberends/vagrant,nickryand/vagrant,tomfanning/vagrant,lukebakken/vagrant,jtopper/vagrant,jkburges/vagrant,lukebakken/vagrant,Chhed13/vagrant,kamazee/vagrant,philwrenn/vagrant,channui/vagrant,stephancom/vagrant,wangfakang/vagrant,marxarelli/vagrant,wkolean/vagrant,vamegh/vagrant,johntron/vagrant,TheBigBear/vagrant,Chhunlong/vagrant,philoserf/vagrant,philwrenn/vagrant,Avira/vagrant,legal90/vagrant,benizi/vagrant,wkolean/vagrant,wangfakang/vagrant,mpoeter/vagrant,jean/vagrant,mitchellh/vagrant,denisbr/vagrant,p0deje/vagrant,legal90/vagrant,tknerr/vagrant,loren-osborn/vagrant,aaam/vagrant,chrisroberts/vagrant,tbriggs-curse/vagrant,jmanero/vagrant,Sgoettschkes/vagrant,janek-warchol/vagrant,chrisvire/vagrant,lonniev/vagrant,tjanez/vagrant,Avira/vagrant,carlosefr/vagrant,Sgoettschkes/vagrant,Sgoettschkes/vagrant,benh57/vagrant,senglin/vagrant,taliesins/vagrant,marxarelli/vagrant,gbarberi/vagrant,philoserf/vagrant,gpkfr/vagrant,Chhunlong/vagrant,theist/vagrant,teotihuacanada/vagrant,gpkfr/vagrant,zsjohny/vagrant,doy/vagrant,tknerr/vagrant,dharmab/vagrant,PatrickLang/vagrant,philwrenn/vagrant,h4ck3rm1k3/vagrant,BlakeMesdag/vagrant,sni/vagrant,justincampbell/vagrant,signed8bit/vagrant,signed8bit/vagrant,kalabiyau/vagrant,senglin/vagrant,muhanadra/vagrant,tjanez/vagrant,juiceinc/vagrant,kamigerami/vagrant,evverx/vagrant,zsjohny/vagrant,mpoeter/vagrant,tschortsch/vagrant,myrjola/vagrant,bdwyertech/vagrant,marxarelli/vagrant,vamegh/vagrant,benizi/vagrant,channui/vagrant,mitchellh/vagrant,Avira/vagrant,h4ck3rm1k3/vagrant,ianmiell/vagrant,dhoer/vagrant,taliesins/vagrant,lonniev/vagrant,signed8bit/vagrant,kamazee/vagrant,bryson/vagrant,jkburges/vagrant,apertoso/vagrant,tknerr/vagrant,petems/vagrant,dustymabe/vagrant,jfchevrette/vagrant,jberends/vagrant,denisbr/vagrant,fnewberg/vagrant,blueyed/vagrant,cgvarela/vagrant,tbriggs-curse/vagrant,jtopper/vagrant,jfchevrette/vagrant,fnewberg/vagrant,mwrock/vagrant,ArloL/vagrant,crashlytics/vagrant,carlosefr/vagrant,cgvarela/vagrant,stephancom/vagrant,tschortsch/vagrant,chrisvire/vagrant,sni/vagrant,mwrock/vagrant,kalabiyau/vagrant,sax/vagrant,doy/vagrant,genome21/vagrant,juiceinc/vagrant,sferik/vagrant,vamegh/vagrant,wkolean/vagrant,darkn3rd/vagrant,crashlytics/vagrant,MiLk/vagrant,stephancom/vagrant,ianmiell/vagrant,jean/vagrant,invernizzi-at-google/vagrant,Chhunlong/vagrant,tomfanning/vagrant,chrisroberts/vagrant,aneeshusa/vagrant,crashlytics/vagrant,loren-osborn/vagrant,pwnall/vagrant,dharmab/vagrant,aaam/vagrant,krig/vagrant