diff --git a/src/vs/workbench/api/browser/mainThreadNotebook.ts b/src/vs/workbench/api/browser/mainThreadNotebook.ts
index e6d56a2eeca..6ac60370279 100644
--- a/src/vs/workbench/api/browser/mainThreadNotebook.ts
+++ b/src/vs/workbench/api/browser/mainThreadNotebook.ts
@@ -21,11 +21,11 @@ export class MainThreadCell implements ICell {
 
 	private _outputs: IOutput[];
 
-	public get outputs(): IOutput[] {
+	get outputs(): IOutput[] {
 		return this._outputs;
 	}
 
-	public set outputs(newOutputs: IOutput[]) {
+	set outputs(newOutputs: IOutput[]) {
 		this._outputs = newOutputs;
 		this._onDidChangeOutputs.fire();
 	}
@@ -58,17 +58,17 @@ export class MainThreadCell implements ICell {
 
 export class MainThreadNotebookDocument extends Disposable implements INotebook {
 	private readonly _onWillDispose: Emitter<void> = this._register(new Emitter<void>());
-	public readonly onWillDispose: Event<void> = this._onWillDispose.event;
+	readonly onWillDispose: Event<void> = this._onWillDispose.event;
 	private readonly _onDidChangeCells = new Emitter<void>();
 	get onDidChangeCells(): Event<void> { return this._onDidChangeCells.event; }
 	private _onDidChangeDirtyState = new Emitter<boolean>();
 	onDidChangeDirtyState: Event<boolean> = this._onDidChangeDirtyState.event;
 	private _mapping: Map<number, MainThreadCell> = new Map();
 	private _cellListeners: Map<number, IDisposable> = new Map();
-	public cells: MainThreadCell[];
-	public activeCell: MainThreadCell | undefined;
-	public languages: string[] = [];
-	public renderers = new Set<number>();
+	cells: MainThreadCell[];
+	activeCell: MainThreadCell | undefined;
+	languages: string[] = [];
+	renderers = new Set<number>();
 
 	private _isDirty: boolean = false;
 
diff --git a/src/vs/workbench/api/common/extHostNotebook.ts b/src/vs/workbench/api/common/extHostNotebook.ts
index 69350b9c9d0..f994acea406 100644
--- a/src/vs/workbench/api/common/extHostNotebook.ts
+++ b/src/vs/workbench/api/common/extHostNotebook.ts
@@ -389,7 +389,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
 		return this._activeNotebookDocument;
 	}
 
-	public registerNotebookOutputRenderer(
+	registerNotebookOutputRenderer(
 		extension: IExtensionDescription,
 		filter: vscode.NotebookOutputSelector,
 		renderer: vscode.NotebookOutputRenderer
@@ -413,7 +413,7 @@ export class ExtHostNotebookController implements ExtHostNotebookShape, ExtHostN
 		return;
 	}
 
-	public registerNotebookProvider(
+	registerNotebookProvider(
 		extension: IExtensionDescription,
 		viewType: string,
 		provider: vscode.NotebookProvider,
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts b/src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts
index 907cddee1f7..ca5255b9ed7 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookEditorInput.ts
@@ -42,7 +42,7 @@ export class NotebookEditorModel extends EditorModel {
 		return this._dirty;
 	}
 
-	public getNotebook(): INotebook {
+	getNotebook(): INotebook {
 		if (this._notebook) {
 			return this._notebook;
 		}
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts b/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts
index 6f5ebd9da9a..a7bd33f6e32 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookRegistry.ts
@@ -27,7 +27,7 @@ export function registerOutputTransform<Services extends BrandedService[]>(id: s
 
 class NotebookRegistryImpl {
 
-	public static readonly INSTANCE = new NotebookRegistryImpl();
+	static readonly INSTANCE = new NotebookRegistryImpl();
 
 	private readonly outputTransforms: IOutputTransformDescription[];
 
@@ -35,11 +35,11 @@ class NotebookRegistryImpl {
 		this.outputTransforms = [];
 	}
 
-	public registerOutputTransform<Services extends BrandedService[]>(id: string, types: string[], ctor: { new(editor: INotebookEditor, ...services: Services): IOutputTransformContribution }): void {
+	registerOutputTransform<Services extends BrandedService[]>(id: string, types: string[], ctor: { new(editor: INotebookEditor, ...services: Services): IOutputTransformContribution }): void {
 		this.outputTransforms.push({ id: id, types: types, ctor: ctor as IOutputTransformCtor });
 	}
 
-	public getNotebookOutputTransform(): IOutputTransformDescription[] {
+	getNotebookOutputTransform(): IOutputTransformDescription[] {
 		return this.outputTransforms.slice(0);
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/notebookService.ts b/src/vs/workbench/contrib/notebook/browser/notebookService.ts
index 05da8dbc211..85dbc0589c5 100644
--- a/src/vs/workbench/contrib/notebook/browser/notebookService.ts
+++ b/src/vs/workbench/contrib/notebook/browser/notebookService.ts
@@ -55,15 +55,15 @@ export interface INotebookService {
 export class NotebookInfoStore {
 	private readonly contributedEditors = new Map<string, NotebookProviderInfo>();
 
-	public clear() {
+	clear() {
 		this.contributedEditors.clear();
 	}
 
-	public get(viewType: string): NotebookProviderInfo | undefined {
+	get(viewType: string): NotebookProviderInfo | undefined {
 		return this.contributedEditors.get(viewType);
 	}
 
-	public add(info: NotebookProviderInfo): void {
+	add(info: NotebookProviderInfo): void {
 		if (this.contributedEditors.has(info.id)) {
 			console.log(`Custom editor with id '${info.id}' already registered`);
 			return;
@@ -71,7 +71,7 @@ export class NotebookInfoStore {
 		this.contributedEditors.set(info.id, info);
 	}
 
-	public getContributedNotebook(resource: URI): readonly NotebookProviderInfo[] {
+	getContributedNotebook(resource: URI): readonly NotebookProviderInfo[] {
 		return Array.from(this.contributedEditors.values()).filter(customEditor =>
 			customEditor.matches(resource));
 	}
@@ -87,7 +87,7 @@ class ModelData implements IDisposable {
 		this._modelEventListeners.add(model.onWillDispose(() => onWillDispose(model)));
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this._modelEventListeners.dispose();
 	}
 }
@@ -97,7 +97,7 @@ export class NotebookService extends Disposable implements INotebookService {
 	_serviceBrand: undefined;
 	private readonly _notebookProviders = new Map<string, { controller: IMainNotebookController, extensionData: NotebookExtensionDescription }>();
 	private readonly _notebookRenderers = new Map<number, { extensionData: NotebookExtensionDescription, selectors: INotebookMimeTypeSelector, preloads: URI[] }>();
-	public notebookProviderInfoStore: NotebookInfoStore = new NotebookInfoStore();
+	notebookProviderInfoStore: NotebookInfoStore = new NotebookInfoStore();
 	private readonly _models: { [modelId: string]: ModelData; };
 	private _onDidChangeActiveEditor = new Emitter<{ viewType: string, uri: URI }>();
 	onDidChangeActiveEditor: Event<{ viewType: string, uri: URI }> = this._onDidChangeActiveEditor.event;
@@ -211,11 +211,11 @@ export class NotebookService extends Disposable implements INotebookService {
 		}
 	}
 
-	public getContributedNotebook(resource: URI): readonly NotebookProviderInfo[] {
+	getContributedNotebook(resource: URI): readonly NotebookProviderInfo[] {
 		return this.notebookProviderInfoStore.getContributedNotebook(resource);
 	}
 
-	public getNotebookProviderResourceRoots(): URI[] {
+	getNotebookProviderResourceRoots(): URI[] {
 		let ret: URI[] = [];
 		this._notebookProviders.forEach(val => {
 			ret.push(URI.revive(val.extensionData.location));
diff --git a/src/vs/workbench/contrib/notebook/browser/renderers/cellViewModel.ts b/src/vs/workbench/contrib/notebook/browser/renderers/cellViewModel.ts
index 7dae0f5379c..e5b1b51a7a5 100644
--- a/src/vs/workbench/contrib/notebook/browser/renderers/cellViewModel.ts
+++ b/src/vs/workbench/contrib/notebook/browser/renderers/cellViewModel.ts
@@ -51,7 +51,8 @@ export class CellViewModel extends Disposable {
 	get dynamicHeight(): number | null {
 		return this._dynamicHeight;
 	}
-	public id: string;
+	id: string;
+
 	constructor(
 		public viewType: string,
 		public notebookHandle: number,
diff --git a/src/vs/workbench/contrib/notebook/browser/renderers/contentWidget.ts b/src/vs/workbench/contrib/notebook/browser/renderers/contentWidget.ts
index 3d72fc8c5aa..5aa3ebfa418 100644
--- a/src/vs/workbench/contrib/notebook/browser/renderers/contentWidget.ts
+++ b/src/vs/workbench/contrib/notebook/browser/renderers/contentWidget.ts
@@ -69,11 +69,11 @@ type IMessage = IDimentionMessage | IScrollAckMessage;
 
 let version = 0;
 export class BackLayerWebView extends Disposable {
-	public element: HTMLElement;
-	public webview: WebviewElement;
-	public mapping: Map<string, { cell: CellViewModel, offset: number, top: number }> = new Map();
-	public outputMapping: Map<string, boolean> = new Map();
-	public preloadsCache: Map<string, boolean> = new Map();
+	element: HTMLElement;
+	webview: WebviewElement;
+	mapping: Map<string, { cell: CellViewModel, offset: number, top: number }> = new Map();
+	outputMapping: Map<string, boolean> = new Map();
+	preloadsCache: Map<string, boolean> = new Map();
 
 	constructor(public webviewService: IWebviewService, public notebookService: INotebookService, public notebookHandler: INotebookEditor, public environmentSerice: IEnvironmentService) {
 		super();
@@ -276,7 +276,7 @@ export class BackLayerWebView extends Disposable {
 		return webview;
 	}
 
-	public shouldRenderContentWidget(id: string, widgetTop: number) {
+	shouldRenderContentWidget(id: string, widgetTop: number) {
 		let item = this.mapping.get(id);
 
 		if (item && widgetTop + item.offset !== item.top) {
@@ -286,7 +286,7 @@ export class BackLayerWebView extends Disposable {
 		return undefined;
 	}
 
-	public updateViewScrollTop(top: number, items: { top: number, id: string }[]) {
+	updateViewScrollTop(top: number, items: { top: number, id: string }[]) {
 		items.forEach(item => {
 			if (this.mapping.has(item.id)) {
 				this.mapping.get(item.id)!.top = item.top;
@@ -303,7 +303,7 @@ export class BackLayerWebView extends Disposable {
 		this.webview.sendMessage(message);
 	}
 
-	public createContentWidget(cell: CellViewModel, offset: number, shadowContent: string, initialTop: number, preloads: Set<number>) {
+	createContentWidget(cell: CellViewModel, offset: number, shadowContent: string, initialTop: number, preloads: Set<number>) {
 		this.updateRendererPreloads(preloads);
 
 		let message: ICreationRequestMessage = {
@@ -317,7 +317,7 @@ export class BackLayerWebView extends Disposable {
 		this.mapping.set(cell.id, { cell: cell, offset, top: initialTop });
 	}
 
-	public clearContentWidgets() {
+	clearContentWidgets() {
 		this.webview.sendMessage({
 			type: 'clear'
 		});
@@ -326,7 +326,7 @@ export class BackLayerWebView extends Disposable {
 		this.outputMapping = new Map();
 	}
 
-	public updateRendererPreloads(preloads: Set<number>) {
+	updateRendererPreloads(preloads: Set<number>) {
 		let resources: string[] = [];
 		preloads.forEach(preload => {
 			let preloadResources = this.notebookService.getRendererPreloads(preload).map(preloadResource => preloadResource.with({ scheme: WebviewResourceScheme }));
@@ -348,7 +348,7 @@ export class BackLayerWebView extends Disposable {
 		// @TODO, update allowed resources folder
 	}
 
-	public clearPreloadsCache() {
+	clearPreloadsCache() {
 		this.preloadsCache.clear();
 	}
 }
diff --git a/src/vs/workbench/contrib/notebook/browser/renderers/sizeObserver.ts b/src/vs/workbench/contrib/notebook/browser/renderers/sizeObserver.ts
index dfcea91c446..683d179ff4e 100644
--- a/src/vs/workbench/contrib/notebook/browser/renderers/sizeObserver.ts
+++ b/src/vs/workbench/contrib/notebook/browser/renderers/sizeObserver.ts
@@ -44,23 +44,23 @@ export class BrowserResizeObserver extends Disposable implements IResizeObserver
 		});
 	}
 
-	public getWidth(): number {
+	getWidth(): number {
 		return this.width;
 	}
 
-	public getHeight(): number {
+	getHeight(): number {
 		return this.height;
 	}
 
-	public startObserving(): void {
+	startObserving(): void {
 		this.observer.observe(this.referenceDomElement!);
 	}
 
-	public stopObserving(): void {
+	stopObserving(): void {
 		this.observer.unobserve(this.referenceDomElement!);
 	}
 
-	public dispose(): void {
+	dispose(): void {
 		this.observer.disconnect();
 		super.dispose();
 	}
diff --git a/src/vs/workbench/contrib/notebook/common/notebookProvider.ts b/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
index 9c038ec4623..f2d5a49b540 100644
--- a/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
+++ b/src/vs/workbench/contrib/notebook/common/notebookProvider.ts
@@ -14,9 +14,9 @@ export interface NotebookSelector {
 
 export class NotebookProviderInfo {
 
-	public readonly id: string;
-	public readonly displayName: string;
-	public readonly selector: readonly NotebookSelector[];
+	readonly id: string;
+	readonly displayName: string;
+	readonly selector: readonly NotebookSelector[];
 
 	constructor(descriptor: {
 		readonly id: string;