Improving the format