Cleaned up data validation