refactored settings