Simplify extracting fields from invoice