Improve listing output