Refactored settings method
StyleCop violations fixed