another batch of refactoring fixes
another batch of refactoring fixes

LogosLabs/thebuggenie,SamMousa/thebuggenie,SysBind/thebuggenie,SamMousa/thebuggenie,hurie/thebuggenie,SamMousa/thebuggenie,hurie/thebuggenie,Rvanlaak/thebuggenie,hurie/thebuggenie,JonathanRH/thebuggenie,Rvanlaak/thebuggenie,thebuggenie/thebuggenie,stolenbike/thebuggenie,LogosLabs/thebuggenie,deshion/thebuggenie,milkyway-git/thebuggenie,thebuggenie/thebuggenie,LogosLabs/thebuggenie,azaghal/thebuggenie,SysBind/thebuggenie,Rvanlaak/thebuggenie,stolenbike/thebuggenie,SamMousa/thebuggenie,gabor-udvari/thebuggenie,JonathanRH/thebuggenie,nrensen/thebuggenie,milkyway-git/thebuggenie,azaghal/thebuggenie,milkyway-git/thebuggenie,LogosLabs/thebuggenie,dachaac/thebuggenie,SysBind/thebuggenie,SysBind/thebuggenie,gabor-udvari/thebuggenie,dachaac/thebuggenie,praveenscience/thebuggenie,stolenbike/thebuggenie,gabor-udvari/thebuggenie,praveenscience/thebuggenie,thebuggenie/thebuggenie,JonathanRH/thebuggenie,gabor-udvari/thebuggenie,nrensen/thebuggenie,praveenscience/thebuggenie,milkyway-git/thebuggenie,deshion/thebuggenie,thebuggenie/thebuggenie,deshion/thebuggenie,Rvanlaak/thebuggenie,hurie/thebuggenie,azaghal/thebuggenie,dachaac/thebuggenie,thebuggenie/thebuggenie,stolenbike/thebuggenie,nrensen/thebuggenie,praveenscience/thebuggenie,deshion/thebuggenie,nrensen/thebuggenie,JonathanRH/thebuggenie,dachaac/thebuggenie,azaghal/thebuggenie