Code readability adjustments, minor simplification of the pretty printing code