Refactor approval validations