diff --git a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
index 6b059ce73e0198fab1bd9b44c811c7d2b570fbf6..ebf0fbd9842aaa8e318a2344335dc08c9fdc7b88 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsEditor2.ts
@@ -221,8 +221,8 @@ export class SettingsEditor2 extends BaseEditor {
 
 		this.layoutTrees(dimension);
 
-		let innerWidth = dimension.width - 24 * 2; // 24px padding on left and right
-		let monacoWidth = (innerWidth > 1000 ? 1000 : innerWidth) - 10;
+		const innerWidth = dimension.width - 24 * 2; // 24px padding on left and right
+		const monacoWidth = (innerWidth > 1000 ? 1000 : innerWidth) - 10;
 		this.searchWidget.layout({ height: 20, width: monacoWidth });
 
 		DOM.toggleClass(this.rootElement, 'narrow', dimension.width < 600);
@@ -293,7 +293,7 @@ export class SettingsEditor2 extends BaseEditor {
 
 		const searchContainer = DOM.append(this.headerContainer, $('.search-container'));
 
-		let searchBoxLabel = localize('SearchSettings.AriaLabel', "Search settings");
+		const searchBoxLabel = localize('SearchSettings.AriaLabel', "Search settings");
 		this.searchWidget = this._register(this.instantiationService.createInstance(SuggestEnabledInput, `${SettingsEditor2.ID}.searchbox`, searchContainer, {
 			triggerCharacters: ['@'],
 			provideResults: (query: string) => {
@@ -792,7 +792,7 @@ export class SettingsEditor2 extends BaseEditor {
 
 		// Warn for settings not included in layout
 		if (settingsResult.leftoverSettings.size && !this.hasWarnedMissingSettings) {
-			let settingKeyList = [];
+			const settingKeyList = [];
 			settingsResult.leftoverSettings.forEach(s => {
 				settingKeyList.push(s.key);
 			});
@@ -985,9 +985,9 @@ export class SettingsEditor2 extends BaseEditor {
 		const fullResult: ISearchResult = {
 			filterMatches: []
 		};
-		for (let g of this.defaultSettingsEditorModel.settingsGroups.slice(1)) {
-			for (let sect of g.sections) {
-				for (let setting of sect.settings) {
+		for (const g of this.defaultSettingsEditorModel.settingsGroups.slice(1)) {
+			for (const sect of g.sections) {
+				for (const setting of sect.settings) {
 					fullResult.filterMatches.push({ setting, matches: [], score: 0 });
 				}
 			}
diff --git a/src/vs/workbench/parts/preferences/browser/settingsTree.ts b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
index 702347fe878fb1f137b4d6d9bad3f41a43f131e2..08ef3cd08cfdce510fc01a6af237b32d4b288c60 100644
--- a/src/vs/workbench/parts/preferences/browser/settingsTree.ts
+++ b/src/vs/workbench/parts/preferences/browser/settingsTree.ts
@@ -158,9 +158,9 @@ function settingMatches(s: ISetting, pattern: string): boolean {
 function getFlatSettings(settingsGroups: ISettingsGroup[]) {
 	const result: Set<ISetting> = new Set();
 
-	for (let group of settingsGroups) {
-		for (let section of group.sections) {
-			for (let s of section.settings) {
+	for (const group of settingsGroups) {
+		for (const section of group.sections) {
+			for (const s of section.settings) {
 				if (!s.overrides || !s.overrides.length) {
 					result.add(s);
 				}
@@ -877,7 +877,7 @@ export class SettingsRenderer implements ITreeRenderer {
 
 		common.toDispose.push(excludeWidget.onDidChangeExclude(e => {
 			if (template.context) {
-				let newValue = { ...template.context.scopeValue };
+				const newValue = { ...template.context.scopeValue };
 
 				// first delete the existing entry, if present
 				if (e.originalPattern) {
@@ -1052,7 +1052,7 @@ export class SettingsRenderer implements ITreeRenderer {
 		}
 
 		if (element.overriddenScopeList.length) {
-			let otherOverridesLabel = element.isConfigured ?
+			const otherOverridesLabel = element.isConfigured ?
 				localize('alsoConfiguredIn', "Also modified in") :
 				localize('configuredIn', "Modified in");
 
@@ -1153,6 +1153,7 @@ export class SettingsRenderer implements ITreeRenderer {
 			}));
 
 		const modifiedText = dataElement.isConfigured ? 'Modified' : '';
+
 		// Use ',.' as reader pause
 		const label = dataElement.displayCategory + ' ' + dataElement.displayLabel + ',. ' + modifiedText;
 		const baseId = (dataElement.displayCategory + '_' + dataElement.displayLabel).replace(/ /g, '_').toLowerCase();
@@ -1204,8 +1205,10 @@ export class SettingsRenderer implements ITreeRenderer {
 
 	private renderNumber(dataElement: SettingsTreeSettingElement, template: ISettingTextItemTemplate, onChange: (value: number) => void): void {
 		const modifiedText = dataElement.isConfigured ? 'Modified' : '';
+
 		// Use ',.' as reader pause
-		const label = dataElement.displayCategory + ' ' + dataElement.displayLabel + ' number,. ' + modifiedText; const numParseFn = (dataElement.valueType === 'integer' || dataElement.valueType === 'nullable-integer')
+		const label = dataElement.displayCategory + ' ' + dataElement.displayLabel + ' number,. ' + modifiedText;
+		const numParseFn = (dataElement.valueType === 'integer' || dataElement.valueType === 'nullable-integer')
 			? parseInt : parseFloat;
 
 		const nullNumParseFn = (dataElement.valueType === 'nullable-integer' || dataElement.valueType === 'nullable-number')
@@ -1251,11 +1254,11 @@ export class SettingsRenderer implements ITreeRenderer {
 
 function renderValidations(dataElement: SettingsTreeSettingElement, template: ISettingTextItemTemplate, calledOnStartup: boolean, originalAriaLabel: string) {
 	if (dataElement.setting.validator) {
-		let errMsg = dataElement.setting.validator(template.inputBox.value);
+		const errMsg = dataElement.setting.validator(template.inputBox.value);
 		if (errMsg) {
 			DOM.addClass(template.containerElement, 'invalid-input');
 			template.validationErrorMessageElement.innerText = errMsg;
-			let validationError = localize('validationError', "Validation Error.");
+			const validationError = localize('validationError', "Validation Error.");
 			template.inputBox.inputElement.parentElement.setAttribute('aria-label', [originalAriaLabel, validationError, errMsg].join(' '));
 			if (!calledOnStartup) { ariaAlert(validationError + ' ' + errMsg); }
 			return;