Improve post-scan output