Refactoring settings (II)