began refactoring settings