[UPDATE] slightly cleaner validations