Small refactoring to settings