Improve the verbose output