Merge zip_code with zip_code_matches_state using default args
Add comment why we're doing this