Small settings refactoring