More output whitespace improvements