Format
Cleanup
Minor localization issue