Refactoring in Settings*