diff --git a/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java b/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
index 4e919a8..efa43c5 100644
--- a/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
+++ b/src/main/java/org/apache/maven/shared/filtering/InterpolatorFilterReaderLineEnding.java
@@ -201,12 +201,12 @@
         in.mark( markLength );
 
         int ch = in.read();
-        if ( ( ch == -1 ) || ( ch == '\n' && !supportMultiLineFiltering ) )
+        if ( ch == -1 || ( ch == '\n' && !supportMultiLineFiltering ) )
         {
             return ch;
         }
 
-        boolean inEscape = ( useEscape && ch == getEscapeString().charAt( 0 ) );
+        boolean inEscape = useEscape && ch == getEscapeString().charAt( 0 );
 
         StringBuilder key = new StringBuilder();
 
diff --git a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
index bd55f58..9cabefc 100644
--- a/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
+++ b/src/main/java/org/apache/maven/shared/filtering/MultiDelimiterInterpolatorFilterReaderLineEnding.java
@@ -230,12 +230,12 @@
         BoundedReader in = new BoundedReader( this.in, markLength );
 
         int ch = in.read();
-        if ( ( ch == -1 ) || ( ch == '\n' && !supportMultiLineFiltering ) )
+        if ( ch == -1 || ( ch == '\n' && !supportMultiLineFiltering ) )
         {
             return ch;
         }
 
-        boolean inEscape = ( useEscape && ch == getEscapeString().charAt( 0 ) );
+        boolean inEscape = useEscape && ch == getEscapeString().charAt( 0 );
 
         StringBuilder key = new StringBuilder();
 
