Improve dict formatting