gbp: improve contract formatting