SettingsValidator Refactoring