Minor settings refactor