Refactor headers Validator