Small refactor in settings