Update SettingsManager - Code Cleanup.