Merge "Refactorings to clarify settings code"