[DF-2382] small refactoring of settings manager