Cleaned up validations