Refine pretty printing

A view visual tweaks to @bovi beautification.