Some minor Style && Localization changes