improve data validation scripts