Improved dump formatting