Format table better