Cleanup formatting