Improving formatting