Improved formatting even more.