Improve formatting some more