Small settings controller refactoring