SettingsFragment code refactorings