CleanUp
diff --git a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/elements/IWorkspaceSourceUnit.java b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/elements/IWorkspaceSourceUnit.java
index ea265f9..f652217 100644
--- a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/elements/IWorkspaceSourceUnit.java
+++ b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/elements/IWorkspaceSourceUnit.java
@@ -16,12 +16,16 @@
 
 import org.eclipse.core.resources.IResource;
 
+import org.eclipse.statet.jcommons.lang.NonNullByDefault;
+import org.eclipse.statet.jcommons.lang.Nullable;
+
 import org.eclipse.statet.ecommons.text.IMarkerPositionResolver;
 
 
 /**
  * Source unit of a workspace resource
  */
+@NonNullByDefault
 public interface IWorkspaceSourceUnit extends ISourceUnit {
 	
 	
@@ -39,6 +43,6 @@
 	 * 
 	 * @return the resolver if required
 	 */
-	public IMarkerPositionResolver getMarkerPositionResolver();
+	public @Nullable IMarkerPositionResolver getMarkerPositionResolver();
 	
 }
diff --git a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/impl/FileBufferWorkingBuffer.java b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/impl/FileBufferWorkingBuffer.java
index 6c2b07a..cff572e 100644
--- a/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/impl/FileBufferWorkingBuffer.java
+++ b/ltk/org.eclipse.statet.ltk.core/src/org/eclipse/statet/ltk/model/core/impl/FileBufferWorkingBuffer.java
@@ -101,7 +101,7 @@
 		synchronized (this) {
 			if (this.fileBuffer != null) {
 				return this.fileBuffer;
-			};
+			}
 		}
 		switch (getResourceMode()) {
 		case IFILE:
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/DefaultBrowserInformationInput.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/DefaultBrowserInformationInput.java
index 6015ebb..7cf8ff4 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/DefaultBrowserInformationInput.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/DefaultBrowserInformationInput.java
@@ -140,7 +140,7 @@
 			return s.toString();
 		}
 		
-	};
+	}
 	
 	
 	public static final int FORMAT_NONE= 0;
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/settings/IndentSettingsUI.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/settings/IndentSettingsUI.java
index bf547ff..d1d5ded 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/settings/IndentSettingsUI.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ecommons/text/ui/settings/IndentSettingsUI.java
@@ -48,7 +48,7 @@
 	static {
 		INDENT_NAMES.put(IndentationType.TAB, Messages.CodeStyle_Indent_Type_UseTabs_name);
 		INDENT_NAMES.put(IndentationType.SPACES, Messages.CodeStyle_Indent_Type_UseSpaces_name);
-	};
+	}
 	
 	
 	private Text tabSizeControl;
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/ElementInfoController.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/ElementInfoController.java
index 63e474d..72cc170 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/ElementInfoController.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/ElementInfoController.java
@@ -111,7 +111,7 @@
 			ElementInfoController.this.notifyMonitor.setCanceled(true);
 		}
 		
-	};
+	}
 	private final IProgressMonitor notifyMonitor= new NullProgressMonitor();
 	
 	
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/PostSelectionWithElementInfoController.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/PostSelectionWithElementInfoController.java
index d11e18f..acb9668 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/PostSelectionWithElementInfoController.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/PostSelectionWithElementInfoController.java
@@ -182,7 +182,7 @@
 				PostSelectionWithElementInfoController.this.updateJob.schedule();
 			}
 		}
-	};
+	}
 	
 	public class IgnoreActivation {
 		
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java
index d607c17..902c3cf 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/MultiContentSectionSourceViewerConfiguration.java
@@ -297,7 +297,7 @@
 			return assistant;
 		}
 		return null;
-	};
+	}
 	
 	@Override
 	protected void initContentAssist(final ContentAssist assistant) {
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
index 2b399a8..6439f84 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/sourceediting/SourceEditorViewerConfiguration.java
@@ -136,7 +136,7 @@
 			}
 		}
 		
-	};
+	}
 	
 	
 	private static IInformationControlCreator assistTemplateInformationControlCreator;
diff --git a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/EnhTemplateStore.java b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/EnhTemplateStore.java
index 760c2a5..56d1278 100644
--- a/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/EnhTemplateStore.java
+++ b/ltk/org.eclipse.statet.ltk.ui/src/org/eclipse/statet/ltk/ui/templates/EnhTemplateStore.java
@@ -260,7 +260,7 @@
 	
 	private final ContextTypeRegistry registry;
 	
-	private final CopyOnWriteIdentityListSet<Runnable> listeners= new CopyOnWriteIdentityListSet<>();;
+	private final CopyOnWriteIdentityListSet<Runnable> listeners= new CopyOnWriteIdentityListSet<>();
 	
 	
 	public EnhTemplateStore(final ContextTypeRegistry registry,