diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/GeneralInfoSection.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/GeneralInfoSection.java
index 2762ad8d37..29a36debfa 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/GeneralInfoSection.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/editor/plugin/GeneralInfoSection.java
@@ -481,10 +481,8 @@ protected void createBundleShape(Composite parent, FormToolkit toolkit, IActionB
 		});
 		fBundleShapeDefault.addListener(SWT.Selection, event -> {
 			if (fBundleShapeDefault.getSelection()) {
-				IBundle bundle = getBundle();
-
-				if (bundle instanceof Bundle) {
-					Map<String, IManifestHeader> headers = ((Bundle) bundle).getHeaders();
+				if (getBundle() instanceof Bundle bundle) {
+					Map<String, IManifestHeader> headers = bundle.getHeaders();
 					Object entry = headers.get(ICoreConstants.ECLIPSE_BUNDLE_SHAPE);
 					((IManifestHeader) entry).setValue(null);
 					bundle.setHeader(ICoreConstants.ECLIPSE_BUNDLE_SHAPE, null);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
index 382c6d0028..5fd2fd555e 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/pderesources.properties
@@ -1506,7 +1506,7 @@ PluginWorkingSet_deselectAll_label=Dese&lect All
 PluginDevelopmentPage_presentation=Plug-in Manifest Editor Presentation
 PluginGeneralInfoSection_lazyStart=Activate this plug-in when one of its classes is loaded
 PluginGeneralInfoSection_singleton=This plug-in is a singleton
-PluginGeneralInfoSection_bundleshape=Unpack behavior during installation (Only for P2):
+PluginGeneralInfoSection_bundleshape=Unpack behavior during P2 installation:
 FragmentGeneralInfoSection_singleton=This fragment is a singleton
 PluginWorkingSet_deselectAll_toolTip=Unselect all of these plug-ins for this working set.
 PluginListPage_initializeFromPlugins=&Initialize from the plug-ins list: