Improved formatting yet some more