Refactoring of the Settings Management