minor refactors
minor refactors

cgvarela/weave,rade/weave,dpw/weave,rade/weave,bboreham/weave,squaremo/weave,narry/weave,beni55/weave,paladin74/weave,awanke/weave,kidaa/weave,dpw/weave,inercia/weave,philipz/weave,kidaa/weave,aaam/weave,dpw/weave,aaam/weave,errordeveloper/weave,kidaa/weave,rade/weave,bboreham/weave,aaam/weave,n054/weave,philipz/weave,cgvarela/weave,ycaihua/weave,narry/weave,beni55/weave,2opremio/weave,awh/weave,errordeveloper/weave,achanda/weave,OnePaaS/weave,weaveworks/weave,cgvarela/weave,tomwilkie/weave,bboreham/weave,philipz/weave,OnePaaS/weave,n054/weave,beni55/weave,BWITS/weave,squaremo/weave,2opremio/weave,tomwilkie/weave,awh/weave,squaremo/weave,awh/weave,OnePaaS/weave,cgvarela/weave,errordeveloper/weave,paulbellamy/weave,awanke/weave,dpw/weave,philipz/weave,paulbellamy/weave,weaveworks/weave,dpw/weave,tomwilkie/weave,2opremio/weave,n054/weave,rade/weave,paulbellamy/weave,errordeveloper/weave,kidaa/weave,aaam/weave,awh/weave,weaveworks/weave,inercia/weave,paladin74/weave,achanda/weave,inercia/weave,narry/weave,inercia/weave,kidaa/weave,ycaihua/weave,achanda/weave,OnePaaS/weave,cgvarela/weave,2opremio/weave,achanda/weave,paladin74/weave,awanke/weave,squaremo/weave,paulbellamy/weave,awanke/weave,narry/weave,rade/weave,ycaihua/weave,narry/weave,philipz/weave,paladin74/weave,aaam/weave,OnePaaS/weave,weaveworks/weave,n054/weave,bboreham/weave,awh/weave,2opremio/weave,achanda/weave,ycaihua/weave,beni55/weave,squaremo/weave,tomwilkie/weave,inercia/weave,ycaihua/weave,awanke/weave,tomwilkie/weave,BWITS/weave,BWITS/weave,beni55/weave,BWITS/weave,n054/weave,paladin74/weave,bboreham/weave,BWITS/weave,errordeveloper/weave