Cleaned up validation examples a bit