Refactor and validation improvements
Refactor and validation improvements

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