settings, small refactoring