Refactored settings