Small refactor
Small refactor

dbirchak/cartodb,codeandtheory/cartodb,nyimbi/cartodb,CartoDB/cartodb,future-analytics/cartodb,splashblot/dronedb,codeandtheory/cartodb,codeandtheory/cartodb,codeandtheory/cartodb,DigitalCoder/cartodb,bloomberg/cartodb,DigitalCoder/cartodb,UCL-ShippingGroup/cartodb-1,splashblot/dronedb,codeandtheory/cartodb,splashblot/dronedb,nuxcode/cartodb,splashblot/dronedb,UCL-ShippingGroup/cartodb-1,nuxcode/cartodb,UCL-ShippingGroup/cartodb-1,thorncp/cartodb,bloomberg/cartodb,thorncp/cartodb,raquel-ucl/cartodb,nyimbi/cartodb,raquel-ucl/cartodb,nyimbi/cartodb,dbirchak/cartodb,bloomberg/cartodb,dbirchak/cartodb,CartoDB/cartodb,future-analytics/cartodb,nuxcode/cartodb,DigitalCoder/cartodb,bloomberg/cartodb,splashblot/dronedb,nyimbi/cartodb,CartoDB/cartodb,raquel-ucl/cartodb,thorncp/cartodb,UCL-ShippingGroup/cartodb-1,UCL-ShippingGroup/cartodb-1,thorncp/cartodb,nuxcode/cartodb,dbirchak/cartodb,DigitalCoder/cartodb,raquel-ucl/cartodb,DigitalCoder/cartodb,future-analytics/cartodb,future-analytics/cartodb,bloomberg/cartodb,nyimbi/cartodb,raquel-ucl/cartodb,CartoDB/cartodb,CartoDB/cartodb,thorncp/cartodb,nuxcode/cartodb,dbirchak/cartodb,future-analytics/cartodb