Cleaned up Validation helpers