Simplify and tidy the presentation of average price indices