Settings Refactoring