Small Settings refactorizing