Improved formatting some more