diff --git a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java
index 993d4dcc..f90ebc26 100644
--- a/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java
+++ b/csv/src/main/java/com/fasterxml/jackson/dataformat/csv/CsvParser.java
@@ -498,14 +498,13 @@ public void setCodec(ObjectCodec c) {
     }
 
     @Override
-    public void setSchema(FormatSchema schema)
+    public void setSchema(final FormatSchema schema)
     {
         if (schema instanceof CsvSchema) {
             _schema = (CsvSchema) schema;
-            String str = _schema.getNullValueString();
-            _nullValue = str;
+            _nullValue = _schema.getNullValueString();
         } else if (schema == null) {
-            schema = EMPTY_SCHEMA;
+            _schema = EMPTY_SCHEMA;
         } else {
             super.setSchema(schema);
         }
@@ -924,7 +923,7 @@ protected void _readHeaderLine() throws IOException {
         int newColumnCount = newSchema.size();
         if (newColumnCount < 2) { // 1 just because we may get 'empty' header name
             String first = (newColumnCount == 0) ? "" : newSchema.columnName(0).trim();
-            if (first.length() == 0) {
+            if (first.isEmpty()) {
                 _reportCsvMappingError("Empty header line: can not bind data");
             }
         }
@@ -1468,9 +1467,6 @@ protected boolean _isNullValue(String value) {
         if (_cfgEmptyStringAsNull && value.isEmpty()) {
             return true;
         }
-        if (_cfgEmptyUnquotedStringAsNull && value.isEmpty() && !_reader.isCurrentTokenQuoted()) {
-            return true;
-        }
-        return false;
+        return _cfgEmptyUnquotedStringAsNull && value.isEmpty() && !_reader.isCurrentTokenQuoted();
     }
 }