Improve pretty printer for Pi's

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
Improve pretty printer for Pi's