Improving formatting and resilience.