cleaned up validations