Improved output of -D