more cleanup in pretty printing
minor printing change
merge