diff --git a/fop-core/src/main/java/org/apache/fop/afp/Factory.java b/fop-core/src/main/java/org/apache/fop/afp/Factory.java
index 00816e4b56b..9fdaaa32cd3 100644
--- a/fop-core/src/main/java/org/apache/fop/afp/Factory.java
+++ b/fop-core/src/main/java/org/apache/fop/afp/Factory.java
@@ -157,8 +157,7 @@ public Factory() {
     public ImageObject createImageObject() {
         String name = IMAGE_NAME_PREFIX
         + StringUtils.lpad(String.valueOf(++imageCount), '0', 5);
-        ImageObject imageObject = new ImageObject(this, name);
-        return imageObject;
+        return new ImageObject(this, name);
     }
 
     /**
@@ -169,8 +168,7 @@ public ImageObject createImageObject() {
     public IMImageObject createIMImageObject() {
         String name = IM_IMAGE_NAME_PREFIX
         + StringUtils.lpad(String.valueOf(++imImageCount), '0', 3);
-        IMImageObject imImageObject = new IMImageObject(name);
-        return imImageObject;
+        return new IMImageObject(name);
     }
 
     /**
@@ -181,8 +179,7 @@ public IMImageObject createIMImageObject() {
     public GraphicsObject createGraphicsObject() {
         String name = GRAPHIC_NAME_PREFIX
         + StringUtils.lpad(String.valueOf(++graphicCount), '0', 5);
-        GraphicsObject graphicsObj = new GraphicsObject(this, name);
-        return graphicsObj;
+        return new GraphicsObject(this, name);
     }
 
     /**
@@ -323,9 +320,8 @@ public Overlay createOverlay(int width, int height,
             int widthRes, int heightRes, int overlayRotation) {
         String overlayName = OVERLAY_NAME_PREFIX
         + StringUtils.lpad(String.valueOf(++overlayCount), '0', 5);
-        Overlay overlay = new Overlay(this, overlayName, width, height,
+        return new Overlay(this, overlayName, width, height,
                 overlayRotation, widthRes, heightRes);
-        return overlay;
     }
 
     /**
@@ -336,8 +332,7 @@ public Overlay createOverlay(int width, int height,
     public Document createDocument() {
         String documentName = DOCUMENT_NAME_PREFIX
         + StringUtils.lpad(String.valueOf(++documentCount), '0', 5);
-        Document document = new Document(this, documentName);
-        return document;
+        return new Document(this, documentName);
     }
 
     /**
@@ -346,8 +341,7 @@ public Document createDocument() {
      * @return a new {@link MapCodedFont}
      */
     public MapCodedFont createMapCodedFont() {
-        MapCodedFont mapCodedFont = new MapCodedFont();
-        return mapCodedFont;
+        return new MapCodedFont();
     }
 
     /**
@@ -360,8 +354,7 @@ public MapCodedFont createMapCodedFont() {
      * @return a new {@link IncludePageSegment}
      */
     public IncludePageSegment createIncludePageSegment(String name, int x, int y) {
-        IncludePageSegment includePageSegment = new IncludePageSegment(name, x, y);
-        return includePageSegment;
+        return new IncludePageSegment(name, x, y);
     }
 
     /**
@@ -371,8 +364,7 @@ public IncludePageSegment createIncludePageSegment(String name, int x, int y) {
      * @return a new {@link IncludeObject}
      */
     public IncludeObject createInclude(String name) {
-        IncludeObject includeObject = new IncludeObject(name);
-        return includeObject;
+        return new IncludeObject(name);
     }
 
     /**
@@ -382,8 +374,7 @@ public IncludeObject createInclude(String name) {
      * @return a new {@link TagLogicalElement}
      */
     public TagLogicalElement createTagLogicalElement(TagLogicalElement.State state) {
-        TagLogicalElement tle = new TagLogicalElement(state);
-        return tle;
+        return new TagLogicalElement(state);
     }
 
     /**
@@ -394,8 +385,7 @@ public TagLogicalElement createTagLogicalElement(TagLogicalElement.State state)
      * @return a new {@link DataStream}
      */
     public DataStream createDataStream(AFPPaintingState paintingState, OutputStream outputStream) {
-        DataStream dataStream = new DataStream(this, paintingState, outputStream);
-        return dataStream;
+        return new DataStream(this, paintingState, outputStream);
     }
 
     /**
@@ -408,8 +398,7 @@ public DataStream createDataStream(AFPPaintingState paintingState, OutputStream
      * @return a new {@link PageDescriptor}
      */
     public PageDescriptor createPageDescriptor(int width, int height, int widthRes, int heightRes) {
-        PageDescriptor pageDescriptor = new PageDescriptor(width, height, widthRes, heightRes);
-        return pageDescriptor;
+        return new PageDescriptor(width, height, widthRes, heightRes);
     }
 
     /**
@@ -420,8 +409,7 @@ public PageDescriptor createPageDescriptor(int width, int height, int widthRes,
     public ObjectEnvironmentGroup createObjectEnvironmentGroup() {
         String oegName = OBJECT_ENVIRONMENT_GROUP_NAME_PREFIX
         + StringUtils.lpad(String.valueOf(++objectEnvironmentGroupCount), '0', 5);
-        ObjectEnvironmentGroup objectEnvironmentGroup = new ObjectEnvironmentGroup(oegName);
-        return objectEnvironmentGroup;
+        return new ObjectEnvironmentGroup(oegName);
     }
 
     /**
@@ -430,8 +418,7 @@ public ObjectEnvironmentGroup createObjectEnvironmentGroup() {
      * @return a new {@link GraphicsData}
      */
     public GraphicsData createGraphicsData() {
-        GraphicsData graphicsData = new GraphicsData();
-        return graphicsData;
+        return new GraphicsData();
     }
 
     /**
@@ -445,9 +432,7 @@ public GraphicsData createGraphicsData() {
      */
     public ObjectAreaDescriptor createObjectAreaDescriptor(
             int width, int height, int widthRes, int heightRes) {
-        ObjectAreaDescriptor objectAreaDescriptor
-            = new ObjectAreaDescriptor(width, height, widthRes, heightRes);
-        return objectAreaDescriptor;
+        return new ObjectAreaDescriptor(width, height, widthRes, heightRes);
     }
 
     /**
@@ -460,9 +445,8 @@ public ObjectAreaDescriptor createObjectAreaDescriptor(
      */
     public ObjectAreaPosition createObjectAreaPosition(int x, int y,
             int rotation) {
-        ObjectAreaPosition objectAreaPosition = new ObjectAreaPosition(
+        return new ObjectAreaPosition(
                 x, y, rotation);
-        return objectAreaPosition;
     }
 
     /**
@@ -476,9 +460,8 @@ public ObjectAreaPosition createObjectAreaPosition(int x, int y,
      */
     public ImageDataDescriptor createImageDataDescriptor(
             int width, int height, int widthRes, int heightRes) {
-        ImageDataDescriptor imageDataDescriptor = new ImageDataDescriptor(
+        return new ImageDataDescriptor(
                 width, height, widthRes, heightRes);
-        return imageDataDescriptor;
     }
 
     /**
@@ -494,9 +477,8 @@ public ImageDataDescriptor createImageDataDescriptor(
      */
     public GraphicsDataDescriptor createGraphicsDataDescriptor(
             int xlwind, int xrwind, int ybwind, int ytwind, int widthRes, int heightRes) {
-        GraphicsDataDescriptor graphicsDataDescriptor = new GraphicsDataDescriptor(
+        return new GraphicsDataDescriptor(
                 xlwind, xrwind, ybwind, ytwind, widthRes, heightRes);
-        return graphicsDataDescriptor;
     }
 
     /**
@@ -510,9 +492,7 @@ public GraphicsDataDescriptor createGraphicsDataDescriptor(
      */
     public ContainerDataDescriptor createContainerDataDescriptor(
             int dataWidth, int dataHeight, int widthRes, int heightRes) {
-        ContainerDataDescriptor containerDataDescriptor
-            = new ContainerDataDescriptor(dataWidth, dataHeight, widthRes, heightRes);
-        return containerDataDescriptor;
+        return new ContainerDataDescriptor(dataWidth, dataHeight, widthRes, heightRes);
     }
 
     /**
@@ -522,8 +502,7 @@ public ContainerDataDescriptor createContainerDataDescriptor(
      * @return a new {@link MapContainerData}
      */
     public MapContainerData createMapContainerData(byte optionValue) {
-        MapContainerData mapContainerData = new MapContainerData(optionValue);
-        return mapContainerData;
+        return new MapContainerData(optionValue);
     }
 
     /**
@@ -532,8 +511,7 @@ public MapContainerData createMapContainerData(byte optionValue) {
      * @return a new {@link MapDataResource}
      */
     public MapDataResource createMapDataResource() {
-        MapDataResource mapDataResource = new MapDataResource();
-        return mapDataResource;
+        return new MapDataResource();
     }
 
     /**
@@ -546,10 +524,8 @@ public MapDataResource createMapDataResource() {
      */
     public PresentationTextDescriptor createPresentationTextDataDescriptor(
             int width, int height, int widthRes, int heightRes) {
-        PresentationTextDescriptor presentationTextDescriptor
-            = new PresentationTextDescriptor(width, height,
+        return new PresentationTextDescriptor(width, height,
                 widthRes, heightRes);
-        return presentationTextDescriptor;
     }
 
     /**
@@ -558,9 +534,7 @@ public PresentationTextDescriptor createPresentationTextDataDescriptor(
      * @return a new {@link PresentationEnvironmentControl}
      */
     public PresentationEnvironmentControl createPresentationEnvironmentControl() {
-        PresentationEnvironmentControl presentationEnvironmentControl
-            = new PresentationEnvironmentControl();
-        return presentationEnvironmentControl;
+        return new PresentationEnvironmentControl();
     }
 
     /**
@@ -570,8 +544,7 @@ public PresentationEnvironmentControl createPresentationEnvironmentControl() {
      * @return a new {@link InvokeMediumMap}
      */
     public InvokeMediumMap createInvokeMediumMap(String name) {
-        InvokeMediumMap invokeMediumMap = new InvokeMediumMap(name);
-        return invokeMediumMap;
+        return new InvokeMediumMap(name);
     }
 
     /**
@@ -580,8 +553,7 @@ public InvokeMediumMap createInvokeMediumMap(String name) {
      * @return a new {@link ResourceEnvironmentGroup}
      */
     public ResourceEnvironmentGroup createResourceEnvironmentGroup() {
-        ResourceEnvironmentGroup resourceEnvironmentGroup = new ResourceEnvironmentGroup();
-        return resourceEnvironmentGroup;
+        return new ResourceEnvironmentGroup();
     }
 
     /**
@@ -592,8 +564,7 @@ public ResourceEnvironmentGroup createResourceEnvironmentGroup() {
     public ImageSegment createImageSegment() {
         String name = IMAGE_SEGMENT_NAME_PREFIX
         + StringUtils.lpad(String.valueOf(++imageSegmentCount), '0', 2);
-        ImageSegment imageSegment = new ImageSegment(this, name);
-        return imageSegment;
+        return new ImageSegment(this, name);
     }
 
     /**
@@ -602,8 +573,7 @@ public ImageSegment createImageSegment() {
      * @return an {@link ImageContent}
      */
     public ImageContent createImageContent() {
-        ImageContent imageContent = new ImageContent();
-        return imageContent;
+        return new ImageContent();
     }
 
     /**
@@ -613,8 +583,7 @@ public ImageContent createImageContent() {
      * @return a new {@link ImageRasterData}
      */
     public ImageRasterData createImageRasterData(byte[] rasterData) {
-        ImageRasterData imageRasterData = new ImageRasterData(rasterData);
-        return imageRasterData;
+        return new ImageRasterData(rasterData);
     }
 
     /**
@@ -628,9 +597,7 @@ public ImageRasterData createImageRasterData(byte[] rasterData) {
      */
     public ImageSizeParameter createImageSizeParameter(int hsize, int vsize,
             int hresol, int vresol) {
-        ImageSizeParameter imageSizeParameter
-            = new ImageSizeParameter(hsize, vsize, hresol, vresol);
-        return imageSizeParameter;
+        return new ImageSizeParameter(hsize, vsize, hresol, vresol);
     }
 
     public TileTOC createTileTOC() {
diff --git a/fop-core/src/main/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java b/fop-core/src/main/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
index 4c4db49b559..5c919430d22 100644
--- a/fop-core/src/main/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
+++ b/fop-core/src/main/java/org/apache/fop/afp/fonts/CharacterSetBuilder.java
@@ -662,8 +662,7 @@ public FontDescriptor(byte[] data) {
         }
 
         public int getNominalFontSizeInMillipoints() {
-            int nominalFontSize = 100 * getUBIN(data, 39);
-            return nominalFontSize;
+            return 100 * getUBIN(data, 39);
         }
     }
 
diff --git a/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java b/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java
index 46ec3ceb1c7..c939018f625 100644
--- a/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java
+++ b/fop-core/src/main/java/org/apache/fop/apps/FopFactory.java
@@ -193,8 +193,7 @@ public Object run() {
      * @return the newly created FOUserAgent instance initialized with default values
      */
     public FOUserAgent newFOUserAgent() {
-        FOUserAgent userAgent = new FOUserAgent(this, resolver);
-        return userAgent;
+        return new FOUserAgent(this, resolver);
     }
 
     boolean isComplexScriptFeaturesEnabled() {
diff --git a/fop-core/src/main/java/org/apache/fop/apps/io/InternalResourceResolver.java b/fop-core/src/main/java/org/apache/fop/apps/io/InternalResourceResolver.java
index 1fe530bd390..4db07cf4a2a 100644
--- a/fop-core/src/main/java/org/apache/fop/apps/io/InternalResourceResolver.java
+++ b/fop-core/src/main/java/org/apache/fop/apps/io/InternalResourceResolver.java
@@ -135,8 +135,7 @@ public static URI cleanURI(String uriStr) throws URISyntaxException {
         fixedUri = fixedUri.replace(" ", "%20");
         fixedUri = fixedUri.replace("{", "%7B");
         fixedUri = fixedUri.replace("}", "%7D");
-        URI baseURI = new URI(fixedUri);
-        return baseURI;
+        return new URI(fixedUri);
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/cli/InputHandler.java b/fop-core/src/main/java/org/apache/fop/cli/InputHandler.java
index fb72762e91b..819a99ee743 100644
--- a/fop-core/src/main/java/org/apache/fop/cli/InputHandler.java
+++ b/fop-core/src/main/java/org/apache/fop/cli/InputHandler.java
@@ -253,8 +253,7 @@ private XMLReader getXMLReader() throws ParserConfigurationException, SAXExcepti
         spf.setFeature("http://xml.org/sax/features/namespaces", true);
         spf.setFeature("http://apache.org/xml/features/xinclude", true);
         spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-        XMLReader xr = spf.newSAXParser().getXMLReader();
-        return xr;
+        return spf.newSAXParser().getXMLReader();
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningState.java b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningState.java
index 7dfc544541b..3a5031ba7b4 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningState.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphPositioningState.java
@@ -167,8 +167,7 @@ public int[] getAdjustment(int offset) throws IndexOutOfBoundsException {
     public boolean apply(GlyphPositioningSubtable st) {
         assert st != null;
         updateSubtableState(st);
-        boolean applied = st.position(this);
-        return applied;
+        return st.position(this);
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
index 788fe25743f..68a2cca969f 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/fonts/GlyphSubstitutionState.java
@@ -189,8 +189,7 @@ public GlyphSequence getOutput() {
     public boolean apply(GlyphSubstitutionSubtable st) {
         assert st != null;
         updateSubtableState(st);
-        boolean applied = st.substitute(this);
-        return applied;
+        return st.substitute(this);
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
index 76e1df39786..042c77c58ab 100644
--- a/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
+++ b/fop-core/src/main/java/org/apache/fop/complexscripts/scripts/IndicScriptProcessor.java
@@ -350,8 +350,7 @@ private GlyphSequence reorder(GlyphSequence gs, int source, int target) {
     /** {@inheritDoc} */
     @Override
     public boolean position(GlyphSequence gs, String script, String language, int fontSize, GlyphTable.UseSpec[] usa, int[] widths, int[][] adjustments, ScriptContextTester sct) {
-        boolean adjusted = super.position(gs, script, language, fontSize, usa, widths, adjustments, sct);
-        return adjusted;
+        return super.position(gs, script, language, fontSize, usa, widths, adjustments, sct);
     }
 
     /** Abstract syllabizer. */
diff --git a/fop-core/src/main/java/org/apache/fop/event/UnsupportedOperationExceptionFactory.java b/fop-core/src/main/java/org/apache/fop/event/UnsupportedOperationExceptionFactory.java
index ccccac09754..2b94853daad 100644
--- a/fop-core/src/main/java/org/apache/fop/event/UnsupportedOperationExceptionFactory.java
+++ b/fop-core/src/main/java/org/apache/fop/event/UnsupportedOperationExceptionFactory.java
@@ -33,8 +33,7 @@ public class UnsupportedOperationExceptionFactory implements ExceptionFactory {
     /** {@inheritDoc} */
     public Throwable createException(Event event) {
         String msg = EventFormatter.format(event, Locale.ENGLISH);
-        UnsupportedOperationException ex = new UnsupportedOperationException(msg);
-        return ex;
+        return new UnsupportedOperationException(msg);
     }
 
     /** {@inheritDoc} */
diff --git a/fop-core/src/main/java/org/apache/fop/fo/PropertyList.java b/fop-core/src/main/java/org/apache/fop/fo/PropertyList.java
index 2ce1f4c55cf..ed31ef8c49b 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/PropertyList.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/PropertyList.java
@@ -686,8 +686,7 @@ public CommonMarginInline getMarginInlineProps() throws PropertyException {
      * @throws PropertyException if there's a problem while processing the properties
      */
     public CommonAural getAuralProps() throws PropertyException {
-        CommonAural props = new CommonAural(this);
-        return props;
+        return new CommonAural(this);
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/fo/pagination/PageSequenceMaster.java b/fop-core/src/main/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
index 9e040d03df0..2d543ad911d 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
@@ -273,9 +273,8 @@ public SimplePageMaster getLastSimplePageMaster(boolean isOddPage, boolean isFir
             }
         }
 
-        SimplePageMaster pageMaster = currentSubSequence.getLastPageMaster(isOddPage, isFirstPage, isBlank,
+        return currentSubSequence.getLastPageMaster(isOddPage, isFirstPage, isBlank,
                 blockLevelEventProducer);
-        return pageMaster;
     }
 
 }
diff --git a/fop-core/src/main/java/org/apache/fop/fo/properties/PropertyMaker.java b/fop-core/src/main/java/org/apache/fop/fo/properties/PropertyMaker.java
index e61632a0b94..9d22b673610 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/properties/PropertyMaker.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/properties/PropertyMaker.java
@@ -522,8 +522,7 @@ public Property convertShorthandProperty(PropertyList propertyList,
      */
     protected Property checkEnumValues(String value) {
         if (enums != null) {
-            Property p = (Property) enums.get(value);
-            return p;
+            return (Property) enums.get(value);
         }
         return null;
     }
diff --git a/fop-core/src/main/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java b/fop-core/src/main/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java
index 95ed0de851c..bb2862bf782 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java
@@ -47,8 +47,7 @@ public Property convertProperty(Property p,
                 return p;
             }
 
-            ToBeImplementedProperty val = new ToBeImplementedProperty(getPropId());
-            return val;
+            return new ToBeImplementedProperty(getPropId());
         }
     }
 
diff --git a/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java b/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java
index dbe430ad431..07579698287 100644
--- a/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/FontManagerConfigurator.java
@@ -156,9 +156,8 @@ public static FontTriplet.Matcher createFontsMatcher(
                 continue;
             }
         }
-        FontTriplet.Matcher orMatcher = new OrFontTripletMatcher(
+        return new OrFontTripletMatcher(
                 matcherList.toArray(new FontTriplet.Matcher[matcherList.size()]));
-        return orMatcher;
     }
 
     /**
@@ -174,9 +173,8 @@ public static FontTriplet.Matcher createFontsMatcher(
         for (String fontFamily : fontFamilies) {
                 matcherList.add(new FontFamilyRegExFontTripletMatcher(fontFamily));
         }
-        FontTriplet.Matcher orMatcher = new OrFontTripletMatcher(
+        return new OrFontTripletMatcher(
                 matcherList.toArray(new FontTriplet.Matcher[matcherList.size()]));
-        return orMatcher;
     }
 
     private static class OrFontTripletMatcher implements FontTriplet.Matcher {
diff --git a/fop-core/src/main/java/org/apache/fop/fonts/MultiByteFont.java b/fop-core/src/main/java/org/apache/fop/fonts/MultiByteFont.java
index cbaace8a2e9..77134bae97e 100644
--- a/fop-core/src/main/java/org/apache/fop/fonts/MultiByteFont.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/MultiByteFont.java
@@ -582,8 +582,7 @@ public CharSequence reorderCombiningMarks(
                 associations.clear();
                 associations.addAll(ogs.getAssociations());
             }
-            CharSequence ocs = mapGlyphsToChars(ogs);
-            return ocs;
+            return mapGlyphsToChars(ogs);
         } else {
             return cs;
         }
diff --git a/fop-core/src/main/java/org/apache/fop/fonts/truetype/FontFileReader.java b/fop-core/src/main/java/org/apache/fop/fonts/truetype/FontFileReader.java
index 790e885bc87..96ea76df422 100644
--- a/fop-core/src/main/java/org/apache/fop/fonts/truetype/FontFileReader.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/truetype/FontFileReader.java
@@ -100,8 +100,7 @@ private byte read() throws IOException {
             throw new java.io.EOFException("Reached EOF, file size=" + fsize);
         }
 
-        final byte ret = file[current++];
-        return ret;
+        return file[current++];
     }
 
     /**
@@ -138,8 +137,7 @@ public final int readTTFUByte() throws IOException {
      */
     public final short readTTFShort() throws IOException {
         final int ret = (readTTFUByte() << 8) + readTTFUByte();
-        final short sret = (short)ret;
-        return sret;
+        return (short)ret;
     }
 
     /**
@@ -149,8 +147,7 @@ public final short readTTFShort() throws IOException {
      * @throws IOException If EOF is reached
      */
     public final int readTTFUShort() throws IOException {
-        final int ret = (readTTFUByte() << 8) + readTTFUByte();
-        return ret;
+        return (readTTFUByte() << 8) + readTTFUByte();
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java b/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java
index 95113f40763..d4c2d7e3e49 100644
--- a/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java
+++ b/fop-core/src/main/java/org/apache/fop/fonts/truetype/OpenFont.java
@@ -1050,15 +1050,13 @@ public String getStemV() {
      * @return String The ItalicAngle
      */
     public String getItalicAngle() {
-        String ia = Short.toString((short)(italicAngle / 0x10000));
-
         // This is the correct italic angle, however only int italic
         // angles are supported at the moment so this is commented out.
         /*
          * if ((italicAngle % 0x10000) > 0 )
          * ia=ia+(comma+Short.toString((short)((short)((italicAngle % 0x10000)*1000)/0x10000)));
          */
-        return ia;
+        return Short.toString((short)(italicAngle / 0x10000));
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java b/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
index 02f1d68712a..ce45609a715 100644
--- a/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
+++ b/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageConverterSVG2G2D.java
@@ -107,8 +107,7 @@ public Image convert(final Image src, Map hints) throws ImageException {
 
         //Create g2d image
         ImageInfo imageInfo = src.getInfo();
-        ImageGraphics2D g2dImage = new ImageGraphics2D(imageInfo, painter);
-        return g2dImage;
+        return new ImageGraphics2D(imageInfo, painter);
     }
 
     private float getResolution(Map hints, Object key) {
diff --git a/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java b/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java
index 6d84a03d32c..a33589f9621 100644
--- a/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java
+++ b/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageConverterWMF2G2D.java
@@ -53,8 +53,7 @@ public Image convert(Image src, Map hints) {
         Graphics2DImagePainter painter;
         painter = new Graphics2DImagePainterWMF(wmf);
 
-        ImageGraphics2D g2dImage = new ImageGraphics2D(src.getInfo(), painter);
-        return g2dImage;
+        return new ImageGraphics2D(src.getInfo(), painter);
     }
 
     /** {@inheritDoc} */
diff --git a/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageLoaderWMF.java b/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageLoaderWMF.java
index bed3043c609..506fc638617 100644
--- a/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageLoaderWMF.java
+++ b/fop-core/src/main/java/org/apache/fop/image/loader/batik/ImageLoaderWMF.java
@@ -63,8 +63,7 @@ public Image loadImage(ImageInfo info, Map hints, ImageSessionContext session)
             throw new IllegalArgumentException(
                     "ImageInfo was expected to contain the Windows Metafile (WMF)");
         }
-        ImageWMF wmfImage = (ImageWMF)img;
-        return wmfImage;
+        return (ImageWMF)img;
     }
 
 }
diff --git a/fop-core/src/main/java/org/apache/fop/image/loader/batik/PreloaderSVG.java b/fop-core/src/main/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
index 4d8f6d123a2..4e4d40aee07 100644
--- a/fop-core/src/main/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
+++ b/fop-core/src/main/java/org/apache/fop/image/loader/batik/PreloaderSVG.java
@@ -128,9 +128,7 @@ private ImageInfo getImage(String uri, Source src,
                             getParserName());
                     doc = factory.createSVGDocument(src.getSystemId(), in);
                 }
-                ImageInfo info = createImageInfo(uri, context, doc);
-
-                return info;
+                return createImageInfo(uri, context, doc);
             } catch (NoClassDefFoundError ncdfe) {
                 if (in != null) {
                     try {
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/FlowLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
index e8e75a75fcf..93726e4ff06 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
@@ -413,8 +413,7 @@ public Area getParentArea(Area childArea) {
      */
     @Override
     public int getContentAreaIPD() {
-        int flowIPD = getPSLM().getCurrentColumnWidth();
-        return flowIPD;
+        return getPSLM().getCurrentColumnWidth();
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
index fc6e0583502..e921e1bd76b 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageBreaker.java
@@ -819,9 +819,8 @@ protected int handleFloatLayout(PageBreakingAlgorithm alg, int optimalPageCount,
                 restartAtLM = position.getPosition().getLM();
             }
         }
-        int nextSequenceStartsOn = getNextBlockList(childLC, Constants.EN_COLUMN, positionAtBreak,
+        return getNextBlockList(childLC, Constants.EN_COLUMN, positionAtBreak,
                 restartAtLM, firstElements);
-        return nextSequenceStartsOn;
     }
 
     protected void addAreasForFloats(PageBreakingAlgorithm alg, int startPart, int partCount,
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 32c7661bd9e..52eca71b40e 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -325,8 +325,7 @@ public List<List<KnuthElement>> getTableFooterFootnotes() {
 
     private List<List<KnuthElement>> getTableFootnotes(List<List<KnuthElement>> tableFootnotes) {
         if (tableFootnotes == null) {
-            List<List<KnuthElement>> emptyList = Collections.emptyList();
-            return emptyList;
+            return Collections.emptyList();
         } else {
             return tableFootnotes;
         }
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManager.java
index c644d7f8261..5a52a50f72d 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/RetrieveTableMarkerLayoutManager.java
@@ -68,8 +68,7 @@ private TableLayoutManager getTableLayoutManager() {
         while (!(parentLM instanceof TableLayoutManager)) {
             parentLM = parentLM.getParent();
         }
-        TableLayoutManager tlm = (TableLayoutManager) parentLM;
-        return tlm;
+        return (TableLayoutManager) parentLM;
     }
 
 }
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java
index 9319386975e..a812971c681 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java
@@ -427,8 +427,7 @@ private int getActualBaselineOffset(int baselineIdentifier) {
      * @return the offset
      */
     private int getTotalTopOffset() {
-        int offset = getTotalAlignmentBaselineOffset() + getAltitude();
-        return offset;
+        return getTotalAlignmentBaselineOffset() + getAltitude();
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ImageLayout.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
index 8a25dc62b02..24286d59fd5 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ImageLayout.java
@@ -365,8 +365,7 @@ public boolean isClipped() {
 
     private int evaluateLength(Length length, int referenceValue) {
         double numericValue = length.getNumericValue(percentBaseContext);
-        int bpd = numericValue < 0 ? referenceValue : (int) Math.round(numericValue);
-        return bpd;
+        return numericValue < 0 ? referenceValue : (int) Math.round(numericValue);
     }
 
     private int evaluateLength(Length length) {
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTable.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTable.java
index 1ccba23d757..0e6ee06cff5 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTable.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTable.java
@@ -199,9 +199,8 @@ void setBeforeAndAfterBaselines(int beforeBaseline, int afterBaseline) {
      * @return a new baseline with the new baseline
      */
     ScaledBaselineTable deriveScaledBaselineTable(int baselineIdentifier) {
-        ScaledBaselineTable bac = new ScaledBaselineTable(altitude, depth, xHeight,
+        return new ScaledBaselineTable(altitude, depth, xHeight,
                 baselineIdentifier, this.writingMode);
-        return bac;
     }
 
 }
diff --git a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
index 7e369e5261d..adfe5803345 100644
--- a/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
+++ b/fop-core/src/main/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
@@ -347,8 +347,7 @@ private TableLayoutManager getTableLayoutManager() {
         while (!(parentLM instanceof TableLayoutManager)) {
             parentLM = parentLM.getParent();
         }
-        TableLayoutManager tlm = (TableLayoutManager) parentLM;
-        return tlm;
+        return (TableLayoutManager) parentLM;
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFEncryptionJCE.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFEncryptionJCE.java
index edebbb23a5c..a6a79e37041 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFEncryptionJCE.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFEncryptionJCE.java
@@ -123,7 +123,7 @@ private boolean isVersion5Revision5Algorithm() {
         }
 
         private String createEncryptionDictionary(final int permissions, InitializationEngine engine) {
-            String encryptionDict = "<<\n"
+            return "<<\n"
                     + "/Filter /Standard\n"
                     + "/V " + version + "\n"
                     + "/R " + revision + "\n"
@@ -131,7 +131,6 @@ private String createEncryptionDictionary(final int permissions, InitializationE
                     + "/P " + permissions + "\n"
                     + engine.getEncryptionDictionaryPart()
                     + ">>";
-            return encryptionDict;
         }
 
     }
@@ -251,9 +250,8 @@ void run() {
         }
 
         protected String getEncryptionDictionaryPart() {
-            String encryptionDictionaryPart = "/O " + PDFText.toHex(oValue) + "\n"
+            return "/O " + PDFText.toHex(oValue) + "\n"
                     + "/U " + PDFText.toHex(uValue) + "\n";
-            return encryptionDictionaryPart;
         }
 
         protected abstract void computeOValue();
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java
index 16b1e80bc2e..5c313ba3b35 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFFactory.java
@@ -743,8 +743,7 @@ private PDFAction getActionForEmbeddedFile(String filename, boolean newWindow) {
         scriptBuffer.append(fileSpec.getFilename());
         scriptBuffer.append("\", nLaunch:2});");
 
-        PDFJavaScriptLaunchAction action = new PDFJavaScriptLaunchAction(scriptBuffer.toString());
-        return action;
+        return new PDFJavaScriptLaunchAction(scriptBuffer.toString());
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFPageLabels.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFPageLabels.java
index 59b231d5b84..f0a11db7768 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFPageLabels.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFPageLabels.java
@@ -196,7 +196,6 @@ private int romanToArabic(String roman) {
     }
 
     private int alphabeticToArabic(char c) {
-        int arabic = Character.toLowerCase(c) - 'a' + 1;
-        return arabic;
+        return Character.toLowerCase(c) - 'a' + 1;
     }
 }
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFResources.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFResources.java
index f98263fcbf1..f07a9090939 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFResources.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFResources.java
@@ -179,8 +179,7 @@ public PDFName getName() {
      * @return the requested color space or null if it wasn't found
      */
     public PDFICCBasedColorSpace getICCColorSpaceByProfileName(String desc) {
-        PDFICCBasedColorSpace cs = this.iccColorSpaces.get(desc);
-        return cs;
+        return this.iccColorSpaces.get(desc);
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFStream.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFStream.java
index e8ed5fc045d..8112855ba4f 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFStream.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFStream.java
@@ -187,11 +187,9 @@ protected void outputRawStreamData(OutputStream out) throws IOException {
      * {@inheritDoc}
      */
     public int output(OutputStream stream) throws IOException {
-        final int len = super.output(stream);
-
         //Now that the data has been written, it can be discarded.
 //        this.data = null;
-        return len;
+        return super.output(stream);
     }
 
     public String streamHashCode() throws IOException {
diff --git a/fop-core/src/main/java/org/apache/fop/render/RendererContext.java b/fop-core/src/main/java/org/apache/fop/render/RendererContext.java
index d715eaccca3..d71c8c05e42 100644
--- a/fop-core/src/main/java/org/apache/fop/render/RendererContext.java
+++ b/fop-core/src/main/java/org/apache/fop/render/RendererContext.java
@@ -109,8 +109,7 @@ public Object getProperty(String prop) {
      * @return the generic renderer context wrapper
      */
     public static RendererContextWrapper wrapRendererContext(RendererContext context) {
-        RendererContextWrapper wrapper = new RendererContextWrapper(context);
-        return wrapper;
+        return new RendererContextWrapper(context);
     }
 
     /** {@inheritDoc} **/
diff --git a/fop-core/src/main/java/org/apache/fop/render/RendererFactory.java b/fop-core/src/main/java/org/apache/fop/render/RendererFactory.java
index ecfe57af63e..9fa9885ea00 100644
--- a/fop-core/src/main/java/org/apache/fop/render/RendererFactory.java
+++ b/fop-core/src/main/java/org/apache/fop/render/RendererFactory.java
@@ -226,9 +226,7 @@ public void addDocumentHandlerMaker(String className) {
      * @return the requested RendererMaker or null if none is available
      */
     public AbstractRendererMaker getRendererMaker(String mime) {
-        AbstractRendererMaker maker
-            = (AbstractRendererMaker)rendererMakerMapping.get(mime);
-        return maker;
+        return (AbstractRendererMaker)rendererMakerMapping.get(mime);
     }
 
     /**
@@ -237,9 +235,7 @@ public AbstractRendererMaker getRendererMaker(String mime) {
      * @return the requested FOEventHandlerMaker or null if none is available
      */
     public AbstractFOEventHandlerMaker getFOEventHandlerMaker(String mime) {
-        AbstractFOEventHandlerMaker maker
-            = (AbstractFOEventHandlerMaker)eventHandlerMakerMapping.get(mime);
-        return maker;
+        return (AbstractFOEventHandlerMaker)eventHandlerMakerMapping.get(mime);
     }
 
     /**
@@ -248,9 +244,7 @@ public AbstractFOEventHandlerMaker getFOEventHandlerMaker(String mime) {
      * @return the requested RendererMaker or null if none is available
      */
     private AbstractIFDocumentHandlerMaker getDocumentHandlerMaker(String mime) {
-        AbstractIFDocumentHandlerMaker maker
-            = (AbstractIFDocumentHandlerMaker)documentHandlerMakerMapping.get(mime);
-        return maker;
+        return (AbstractIFDocumentHandlerMaker)documentHandlerMakerMapping.get(mime);
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandler.java b/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandler.java
index b354da47756..7fd79daf850 100644
--- a/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandler.java
+++ b/fop-core/src/main/java/org/apache/fop/render/afp/AFPImageHandler.java
@@ -114,9 +114,8 @@ public static AFPObjectAreaInfo createObjectAreaInfo(AFPPaintingState paintingSt
         int height = (int) Math.ceil(unitConv.mpt2units(targetRect.height));
 
         int resolution = paintingState.getResolution();
-        AFPObjectAreaInfo objectAreaInfo = new AFPObjectAreaInfo(coords[X], coords[Y], width,
+        return new AFPObjectAreaInfo(coords[X], coords[Y], width,
                 height, resolution, paintingState.getRotation());
-        return objectAreaInfo;
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java b/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java
index f417621be28..33e7d66c527 100644
--- a/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/afp/AFPPainter.java
@@ -202,13 +202,12 @@ protected Map createDefaultImageProcessingHints(ImageSessionContext sessionConte
     /** {@inheritDoc} */
     @Override
     protected RenderingContext createRenderingContext() {
-        AFPRenderingContext renderingContext = new AFPRenderingContext(
+        return new AFPRenderingContext(
                 getUserAgent(),
                 getDocumentHandler().getResourceManager(),
                 getPaintingState(),
                 getFontInfo(),
                 getContext().getForeignAttributes());
-        return renderingContext;
     }
 
     /** {@inheritDoc} */
diff --git a/fop-core/src/main/java/org/apache/fop/render/afp/AFPSVGHandler.java b/fop-core/src/main/java/org/apache/fop/render/afp/AFPSVGHandler.java
index 9ea871d1732..ece76a79f17 100644
--- a/fop-core/src/main/java/org/apache/fop/render/afp/AFPSVGHandler.java
+++ b/fop-core/src/main/java/org/apache/fop/render/afp/AFPSVGHandler.java
@@ -167,9 +167,8 @@ private AFPObjectAreaInfo createObjectAreaInfo(AFPPaintingState paintingState,
         int objY = (int) Math.round(at.getTranslateY());
         int objWidth = Math.round(unitConv.mpt2units(width));
         int objHeight = Math.round(unitConv.mpt2units(height));
-        AFPObjectAreaInfo objectAreaInfo = new AFPObjectAreaInfo(objX, objY, objWidth, objHeight,
+        return new AFPObjectAreaInfo(objX, objY, objWidth, objHeight,
                 resolution, rotation);
-        return objectAreaInfo;
     }
 
     private AFPGraphicsObjectInfo createGraphicsObjectInfo(
diff --git a/fop-core/src/main/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java b/fop-core/src/main/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java
index 296b0482119..599805999a9 100644
--- a/fop-core/src/main/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java
+++ b/fop-core/src/main/java/org/apache/fop/render/bitmap/MultiFileRenderingUtil.java
@@ -92,8 +92,7 @@ public OutputStream createOutputStream(int pageNumber) throws IOException {
         } else {
             File f = new File(outputDir,
                     filePrefix + (pageNumber + 1) + "." + fileExtension);
-            OutputStream os = new BufferedOutputStream(new FileOutputStream(f));
-            return os;
+            return new BufferedOutputStream(new FileOutputStream(f));
         }
     }
 
diff --git a/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRenderer.java b/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRenderer.java
index 09b4530b555..700da33f51d 100644
--- a/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRenderer.java
+++ b/fop-core/src/main/java/org/apache/fop/render/bitmap/TIFFRenderer.java
@@ -207,8 +207,7 @@ public Object next() {
                 SampleModel sm = new PixelInterleavedSampleModel(
                         DataBuffer.TYPE_BYTE, w, h, bands, w * bands, off);
 
-                RenderedImage rimg = new FormatRed(GraphicsUtil.wrap(pageImage), sm);
-                return rimg;
+                return new FormatRed(GraphicsUtil.wrap(pageImage), sm);
             }
         }
 
diff --git a/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DGraphicsState.java b/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DGraphicsState.java
index 70fe0b449b2..209f2a59405 100644
--- a/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DGraphicsState.java
+++ b/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DGraphicsState.java
@@ -281,10 +281,9 @@ public AffineTransform getTransform() {
     /** {@inheritDoc} */
     @Override
     public String toString() {
-        String s = "Java2DGraphicsState " + currentGraphics.toString()
+        return "Java2DGraphicsState " + currentGraphics.toString()
                 + ", Stroke (width: " + currentStrokeWidth + " style: "
                 + currentStrokeStyle + "), " + getTransform();
-        return s;
     }
 
 }
diff --git a/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DPainter.java b/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DPainter.java
index 23636de68ce..7e884936886 100644
--- a/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DPainter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/java2d/Java2DPainter.java
@@ -174,9 +174,8 @@ public void drawImage(String uri, Rectangle rect) throws IFException {
 
     /** {@inheritDoc} */
     protected RenderingContext createRenderingContext() {
-        Java2DRenderingContext java2dContext = new Java2DRenderingContext(
+        return new Java2DRenderingContext(
                 getUserAgent(), g2dState.getGraph(), getFontInfo());
-        return java2dContext;
     }
 
     /** {@inheritDoc} */
diff --git a/fop-core/src/main/java/org/apache/fop/render/pcl/PCLPainter.java b/fop-core/src/main/java/org/apache/fop/render/pcl/PCLPainter.java
index 7df553771f9..20ebaf9e302 100644
--- a/fop-core/src/main/java/org/apache/fop/render/pcl/PCLPainter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/pcl/PCLPainter.java
@@ -163,7 +163,7 @@ public void drawImage(String uri, Rectangle rect) throws IFException {
 
     /** {@inheritDoc} */
     protected RenderingContext createRenderingContext() {
-        PCLRenderingContext pdfContext = new PCLRenderingContext(
+        return new PCLRenderingContext(
                 getUserAgent(), this.gen, getPCLUtil()) {
 
             public Point2D transformedPoint(int x, int y) {
@@ -175,7 +175,6 @@ public GraphicContext getGraphicContext() {
             }
 
         };
-        return pdfContext;
     }
 
     /** {@inheritDoc} */
diff --git a/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererContext.java b/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererContext.java
index 9f3d97d7bdf..fee95a09a1c 100644
--- a/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererContext.java
+++ b/fop-core/src/main/java/org/apache/fop/render/pcl/PCLRendererContext.java
@@ -35,8 +35,7 @@ public class PCLRendererContext extends RendererContext.RendererContextWrapper {
      * @return the PCL-specific renderer context wrapper
      */
     public static PCLRendererContext wrapRendererContext(RendererContext context) {
-        PCLRendererContext pcli = new PCLRendererContext(context);
-        return pcli;
+        return new PCLRendererContext(context);
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/AbstractPSTranscoder.java b/fop-core/src/main/java/org/apache/fop/render/ps/AbstractPSTranscoder.java
index a18fddcdc55..5ef1729009e 100644
--- a/fop-core/src/main/java/org/apache/fop/render/ps/AbstractPSTranscoder.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/AbstractPSTranscoder.java
@@ -170,9 +170,8 @@ protected BridgeContext createBridgeContext() {
 
     /** {@inheritDoc} */
     public BridgeContext createBridgeContext(String version) {
-        BridgeContext ctx = new PSBridgeContext(userAgent, (isTextStroked() ? null : fontInfo),
+        return new PSBridgeContext(userAgent, (isTextStroked() ? null : fontInfo),
                 getImageManager(), getImageSessionContext());
-        return ctx;
     }
 
 }
diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/PSPainter.java b/fop-core/src/main/java/org/apache/fop/render/ps/PSPainter.java
index 1d3aaa055a6..7e68947f547 100644
--- a/fop-core/src/main/java/org/apache/fop/render/ps/PSPainter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/PSPainter.java
@@ -148,9 +148,8 @@ protected Map createDefaultImageProcessingHints(ImageSessionContext sessionConte
 
     /** {@inheritDoc} */
     protected RenderingContext createRenderingContext() {
-        PSRenderingContext psContext = new PSRenderingContext(
+        return new PSRenderingContext(
                 getUserAgent(), getGenerator(), getFontInfo());
-        return psContext;
     }
 
     /** {@inheritDoc} */
diff --git a/fop-core/src/main/java/org/apache/fop/render/ps/PSTextPainter.java b/fop-core/src/main/java/org/apache/fop/render/ps/PSTextPainter.java
index 8c643b7a505..cdaa9f1a3ad 100644
--- a/fop-core/src/main/java/org/apache/fop/render/ps/PSTextPainter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/ps/PSTextPainter.java
@@ -197,9 +197,8 @@ private class TextUtil {
 
         public boolean isMultiByte(Font f) {
             FontMetrics metrics = f.getFontMetrics();
-            boolean multiByte = metrics instanceof MultiByteFont || metrics instanceof LazyFont
+            return metrics instanceof MultiByteFont || metrics instanceof LazyFont
                     && ((LazyFont) metrics).getRealFont() instanceof MultiByteFont;
-            return multiByte;
         }
 
         public void writeTextMatrix(AffineTransform transform) throws IOException {
diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/TableAttributesConverter.java b/fop-core/src/main/java/org/apache/fop/render/rtf/TableAttributesConverter.java
index 78a8bcf12ea..84ef998eb43 100644
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/TableAttributesConverter.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/TableAttributesConverter.java
@@ -87,8 +87,7 @@ static RtfAttributes convertTableAttributes(Table fobj)
      */
     static RtfAttributes convertTablePartAttributes(TablePart part)
             throws FOPException {
-        FOPRtfAttributes attrib = new FOPRtfAttributes();
-        return attrib;
+        return new FOPRtfAttributes();
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java
index 452ef3673fc..a4672f1bc01 100644
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java
@@ -236,7 +236,6 @@ public boolean isEmpty() {
      * @throws IOException if not caught
      */
     public RtfTextrun getTextrun() throws IOException {
-        RtfTextrun textrun = RtfTextrun.getTextrun(this, writer, null);
-        return textrun;
+        return RtfTextrun.getTextrun(this, writer, null);
     }
 }
diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
index 23f9f4a1f90..7c833993fe5 100644
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java
@@ -159,8 +159,7 @@ public RtfTextrun getTextrun() throws IOException {
      * @throws IOException for I/O problems
      */
     public RtfList newList(RtfAttributes attrs) throws IOException {
-        RtfList list = new RtfList(this, writer, attrs);
-        return list;
+        return new RtfList(this, writer, attrs);
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
index 4b7850d0bc9..9faf73e67b2 100644
--- a/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
+++ b/fop-core/src/main/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java
@@ -124,8 +124,7 @@ public Integer getColumnRowSpanningNumber() {
      * @return true, if it's the first of multiple spanning columns
      */
     public boolean getFirstSpanningCol() {
-        Boolean b = (Boolean) colFirstSpanningCol.get(colIndex);
-        return b;
+        return (Boolean) colFirstSpanningCol.get(colIndex);
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/servlet/FopServlet.java b/fop-core/src/main/java/org/apache/fop/servlet/FopServlet.java
index 9b8c9a98937..71f06b944d6 100644
--- a/fop-core/src/main/java/org/apache/fop/servlet/FopServlet.java
+++ b/fop-core/src/main/java/org/apache/fop/servlet/FopServlet.java
@@ -270,9 +270,8 @@ protected void render(Source src, Transformer transformer, HttpServletResponse r
 
     /** @return a new FOUserAgent for FOP */
     protected FOUserAgent getFOUserAgent() {
-        FOUserAgent userAgent = fopFactory.newFOUserAgent();
         //Configure foUserAgent as desired
-        return userAgent;
+        return fopFactory.newFOUserAgent();
     }
 
 }
diff --git a/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java b/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java
index 2aca0cd96ab..2ac7a817af7 100644
--- a/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java
+++ b/fop-core/src/main/java/org/apache/fop/svg/AbstractFOPTranscoder.java
@@ -273,8 +273,7 @@ public Source resolveURI(String uri) {
                 try {
                     ParsedURL url = new ParsedURL(baseURI, uri);
                     InputStream in = url.openStream();
-                    StreamSource source = new StreamSource(in, url.toString());
-                    return source;
+                    return new StreamSource(in, url.toString());
                 } catch (IOException ioe) {
                     userAgent.displayError(ioe);
                     return null;
diff --git a/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java b/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java
index cf8701522c5..fc055062fbd 100644
--- a/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java
+++ b/fop-core/src/main/java/org/apache/fop/svg/PDFGraphics2D.java
@@ -396,8 +396,7 @@ private void concatMatrix(AffineTransform transform) {
      * @return the transformation matrix that established the basic user space for this document
      */
     protected AffineTransform getBaseTransform() {
-        AffineTransform at = new AffineTransform(paintingState.getTransform());
-        return at;
+        return new AffineTransform(paintingState.getTransform());
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java b/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java
index ee8e64dcddf..fe34ec0b258 100644
--- a/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java
+++ b/fop-core/src/main/java/org/apache/fop/svg/PDFTranscoder.java
@@ -201,9 +201,8 @@ public BridgeContext createBridgeContext(String version) {
         if (isTextStroked()) {
             fontInfo = null;
         }
-        BridgeContext ctx = new PDFBridgeContext(userAgent, fontInfo,
+        return new PDFBridgeContext(userAgent, fontInfo,
                 getImageManager(), getImageSessionContext());
-        return ctx;
     }
 
 }
diff --git a/fop-core/src/main/java/org/apache/fop/svg/SVGUtilities.java b/fop-core/src/main/java/org/apache/fop/svg/SVGUtilities.java
index 31d39d96efc..f3f5613ad88 100644
--- a/fop-core/src/main/java/org/apache/fop/svg/SVGUtilities.java
+++ b/fop-core/src/main/java/org/apache/fop/svg/SVGUtilities.java
@@ -193,8 +193,7 @@ public static Element createRect(Document doc, float x, float y,
      * @return the new g element
      */
     public static Element createG(Document doc) {
-        Element border = doc.createElementNS(SVG_NS, "g");
-        return border;
+        return doc.createElementNS(SVG_NS, "g");
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/tools/fontlist/FontListGenerator.java b/fop-core/src/main/java/org/apache/fop/tools/fontlist/FontListGenerator.java
index dff9564450c..4c80c9f7b0a 100644
--- a/fop-core/src/main/java/org/apache/fop/tools/fontlist/FontListGenerator.java
+++ b/fop-core/src/main/java/org/apache/fop/tools/fontlist/FontListGenerator.java
@@ -54,8 +54,7 @@ public class FontListGenerator {
     public SortedMap listFonts(FopFactory fopFactory, String mime, FontEventListener listener)
             throws FOPException {
         FontInfo fontInfo = setupFonts(fopFactory, mime, listener);
-        SortedMap fontFamilies = buildFamilyMap(fontInfo);
-        return fontFamilies;
+        return buildFamilyMap(fontInfo);
     }
 
     private FontInfo setupFonts(FopFactory fopFactory, String mime, FontEventListener listener)
diff --git a/fop-core/src/main/java/org/apache/fop/util/ColorUtil.java b/fop-core/src/main/java/org/apache/fop/util/ColorUtil.java
index 43b1af656c0..e31c6a3c35b 100644
--- a/fop-core/src/main/java/org/apache/fop/util/ColorUtil.java
+++ b/fop-core/src/main/java/org/apache/fop/util/ColorUtil.java
@@ -308,8 +308,7 @@ private static Color parseFallback(ListIterator<String> args, String value) thro
         }
         //Sun's classlib rounds differently with this constructor than when converting to sRGB
         //via CIE XYZ.
-        Color sRGB = new Color(red, green, blue, alpha);
-        return sRGB;
+        return new Color(red, green, blue, alpha);
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java b/fop-core/src/main/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java
index 71e85cb806b..836a0b1043b 100644
--- a/fop-core/src/main/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java
+++ b/fop-core/src/main/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java
@@ -94,8 +94,7 @@ public void addContentHandlerFactory(ContentHandlerFactory factory) {
      * @return the ContentHandlerFactory or null, if no suitable instance is available.
      */
     public ContentHandlerFactory getFactory(String namespaceURI) {
-        ContentHandlerFactory factory = (ContentHandlerFactory)factories.get(namespaceURI);
-        return factory;
+        return (ContentHandlerFactory)factories.get(namespaceURI);
     }
 
     /**
diff --git a/fop-core/src/main/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java b/fop-core/src/main/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java
index 1c2b78218b5..c420cc28e7c 100644
--- a/fop-core/src/main/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java
+++ b/fop-core/src/main/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java
@@ -93,10 +93,8 @@ private PlanarImage convertToMonochromePlanarImage(BufferedImage img) {
         RenderingHints hints = new RenderingHints(JAI.KEY_IMAGE_LAYOUT, layout);
 
         // Dither the image.
-        PlanarImage dst = JAI.create(opName, pb, hints);
-
         //Convert it to a BufferedImage
-        return dst;
+        return JAI.create(opName, pb, hints);
     }
 
 }
diff --git a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
index 57443e15df3..02e02a77ac9 100644
--- a/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/accessibility/fo/FO2StructureTreeConverterTestCase.java
@@ -375,8 +375,7 @@ private static void endStructureTreeSequence(TransformerHandler tHandler) throws
     }
 
     private static Diff createDiff(DOMResult expected, DOMResult actual) {
-        Diff diff = new Diff(getDocument(expected), getDocument(actual));
-        return diff;
+        return new Diff(getDocument(expected), getDocument(actual));
     }
 
     private static Document getDocument(DOMResult result) {
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
index f1512903c55..6faf994b610 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GDEFTestCase.java
@@ -3159,8 +3159,7 @@ private TTXFile findTTX(String fid) {
         String pn = findTTXPath(fid);
         assertTrue(pn != null);
         try {
-            TTXFile tf = TTXFile.getFromCache(pn);
-            return tf;
+            return TTXFile.getFromCache(pn);
         } catch (Exception e) {
             fail(e.getMessage());
             return null;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
index cf63b4effc9..ced833e4ac4 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GPOSTestCase.java
@@ -419,8 +419,7 @@ private TTXFile findTTX(String fid) {
         String pn = findTTXPath(fid);
         assertTrue(pn != null);
         try {
-            TTXFile tf = TTXFile.getFromCache(pn);
-            return tf;
+            return TTXFile.getFromCache(pn);
         } catch (Exception e) {
             fail(e.getMessage());
             return null;
diff --git a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
index ad43b920f74..27b3b561344 100644
--- a/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/complexscripts/fonts/GSUBTestCase.java
@@ -146,8 +146,7 @@ private TTXFile findTTX(String fid) {
         String pn = findTTXPath(fid);
         assertTrue(pn != null);
         try {
-            TTXFile tf = TTXFile.getFromCache(pn);
-            return tf;
+            return TTXFile.getFromCache(pn);
         } catch (Exception e) {
             fail(e.getMessage());
             return null;
diff --git a/fop-core/src/test/java/org/apache/fop/intermediate/TestAssistant.java b/fop-core/src/test/java/org/apache/fop/intermediate/TestAssistant.java
index 66939cfcc27..08a7b95e2a0 100644
--- a/fop-core/src/test/java/org/apache/fop/intermediate/TestAssistant.java
+++ b/fop-core/src/test/java/org/apache/fop/intermediate/TestAssistant.java
@@ -219,8 +219,7 @@ public Document loadTestCase(File testFile)
             throws IOException {
         try {
             DocumentBuilder builder = domBuilderFactory.newDocumentBuilder();
-            Document testDoc = builder.parse(testFile);
-            return testDoc;
+            return builder.parse(testFile);
         } catch (Exception e) {
             throw new IOException("Error while loading test case: " + e.getMessage());
         }
diff --git a/fop-core/src/test/java/org/apache/fop/render/afp/NoOperationTestCase.java b/fop-core/src/test/java/org/apache/fop/render/afp/NoOperationTestCase.java
index 9e83829f867..6232509c17e 100644
--- a/fop-core/src/test/java/org/apache/fop/render/afp/NoOperationTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/afp/NoOperationTestCase.java
@@ -108,8 +108,7 @@ public void testNoOperation() throws Exception {
 
     private String getNopText(UnparsedStructuredField field) throws UnsupportedEncodingException {
         byte[] data = field.getData();
-        String text = new String(data, AFPConstants.EBCIDIC_ENCODING);
-        return text;
+        return new String(data, AFPConstants.EBCIDIC_ENCODING);
     }
 
     private UnparsedStructuredField skipTo(MODCAParser parser, int typeID) throws IOException {
diff --git a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
index 02e4e702b98..fb401ff78e6 100644
--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFEncodingTestCase.java
@@ -52,8 +52,7 @@ public PDFEncodingTestCase() throws SAXException, IOException {
      * @return an initialized FOUserAgent
      */
     protected FOUserAgent getUserAgent() {
-        final FOUserAgent a = fopFactory.newFOUserAgent();
-        return a;
+        return fopFactory.newFOUserAgent();
     }
 
     /**
diff --git a/fop-core/src/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java b/fop-core/src/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
index 4376779f98f..46b9a3faa27 100644
--- a/fop-core/src/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
+++ b/fop-core/src/test/java/org/apache/fop/svg/font/FOPFontFamilyResolverTestCase.java
@@ -124,8 +124,7 @@ private LineMetrics getAWTLineMetrics() throws FontFormatException, IOException
         GraphicsEnvironment ge = GraphicsEnvironment.getLocalGraphicsEnvironment();
         BufferedImage dummyImage = new BufferedImage(1000, 1000, BufferedImage.TYPE_INT_RGB);
         FontRenderContext frc = ge.createGraphics(dummyImage).getFontRenderContext();
-        LineMetrics awtMetrics = awtFont.getLineMetrics("ABC", frc);
-        return awtMetrics;
+        return awtFont.getLineMetrics("ABC", frc);
     }
 
     private void printDifference(String value, float awt, float fop) {
diff --git a/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java b/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
index b6a9147f3bf..daef9e87f97 100644
--- a/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
+++ b/fop-core/src/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java
@@ -148,8 +148,7 @@ public BufferedImage produce(File src, int index, ProducerContext context) {
                 }
 
                 convert(tempOut, tempPNG, context);
-                BufferedImage img = BitmapComparator.getImage(tempPNG);
-                return img;
+                return BitmapComparator.getImage(tempPNG);
             } finally {
                 if (deleteTempFiles) {
                     if (!tempOut.delete()) {
diff --git a/fop-events/src/main/java/org/apache/fop/events/EventFormatter.java b/fop-events/src/main/java/org/apache/fop/events/EventFormatter.java
index 1c1698c4ea3..89cb133bad6 100644
--- a/fop-events/src/main/java/org/apache/fop/events/EventFormatter.java
+++ b/fop-events/src/main/java/org/apache/fop/events/EventFormatter.java
@@ -102,8 +102,7 @@ private static String processIncludes(String template, ResourceBundle bundle) {
             replacements = processIncludesInner(input, sb, bundle);
             input = sb;
         } while (replacements > 0);
-        String s = sb.toString();
-        return s;
+        return sb.toString();
     }
 
     private static int processIncludesInner(CharSequence template, StringBuffer sb,
diff --git a/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGPainter.java b/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGPainter.java
index 8c85353d545..9f91c63aafe 100644
--- a/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGPainter.java
+++ b/fop-sandbox/src/main/java/org/apache/fop/render/svg/SVGPainter.java
@@ -240,9 +240,8 @@ public void drawImage(Document doc, Rectangle rect) throws IFException {
 
     /** {@inheritDoc} */
     protected RenderingContext createRenderingContext() {
-        SVGRenderingContext svgContext = new SVGRenderingContext(
+        return new SVGRenderingContext(
                 getUserAgent(), handler);
-        return svgContext;
     }
 
     private static String toString(Paint paint) {