Refactored settings
Refactored settings