Cleaned up white space display which was particularly bad in non-interactive mode