diff --git a/README.md b/README.md
index 187f559..e079083 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,8 @@ Where:
   
   Example:
 
-    substr(str_replace("toto", "tutu\'", $.foo.bar.1), 0, strpos($.foo.bar.1, 'tata')) . $['baz']
+    substr(str_replace("toto", "tutu\'", $.foo.bar.1), 0,
+    strpos($.foo.bar.1, 'tata')) . $['baz']
 
 
 
diff --git a/src/Exception/StringJsonPathSyntaxErrorException.php b/src/Exception/StringJsonPathSyntaxErrorException.php
index 00437f0..9287360 100644
--- a/src/Exception/StringJsonPathSyntaxErrorException.php
+++ b/src/Exception/StringJsonPathSyntaxErrorException.php
@@ -2,10 +2,7 @@
 
 namespace Drupal\xnttstrjp\Exception;
 
-use Drupal\xnttstrjp\Exception\StringJsonPathException;
-
 /**
  * Exception thrown for String Functions and JSONPath syntax errors.
- *
  */
 class StringJsonPathSyntaxErrorException extends StringJsonPathException {}
diff --git a/src/Plugin/ExternalEntities/FieldMapper/StringJsonPath.php b/src/Plugin/ExternalEntities/FieldMapper/StringJsonPath.php
index 4352bb9..85a0895 100644
--- a/src/Plugin/ExternalEntities/FieldMapper/StringJsonPath.php
+++ b/src/Plugin/ExternalEntities/FieldMapper/StringJsonPath.php
@@ -1,10 +1,9 @@
 <?php
+
 namespace Drupal\xnttstrjp\Plugin\ExternalEntities\FieldMapper;
 
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Link;
-use Drupal\Core\Url;
 use Drupal\external_entities\Plugin\ExternalEntities\FieldMapper\JsonPath as FMJsonPath;
 use Drupal\xnttstrjp\Exception\StringJsonPathException;
 use Drupal\xnttstrjp\Exception\StringJsonPathSyntaxErrorException as SyntaxError;
@@ -27,10 +26,15 @@ use JsonPath\JsonObject;
  */
 class StringJsonPath extends FMJsonPath {
 
-  // @todo: improve regex to match complex expressions.
+  // @todo improve regex to match complex expressions.
   public const JSON_PATH_REGEX = '\$(?:\.?\*|\.\.\w*|\.\w+|\[\'\w+\'(?:\s*,\s*\'\w+\')*\]|\[-?\d+(?:\s*,\s*-?\d+)*\]|\[-?\d*:-?\d*\]|\[\*\])+';
-  
-  protected static $available_str_func = [
+
+  /**
+   * Available string functions.
+   *
+   * @var array
+   */
+  protected static $availableStrFunc = [
     'addcslashes'      => TRUE,
     'addslashes'       => TRUE,
     'bin2hex'          => TRUE,
@@ -96,7 +100,7 @@ class StringJsonPath extends FMJsonPath {
     'preg_quote'       => TRUE,
     'preg_replace'     => TRUE,
     'preg_split'       => TRUE,
-    // @todo: maybe add multibyte string functions as well?
+    // @todo maybe add multibyte string functions as well?
     // https://www.php.net/manual/en/ref.mbstring.php
   ];
 
@@ -119,10 +123,9 @@ class StringJsonPath extends FMJsonPath {
     $form['help']['strfunc'] = [
       '#type' => 'markup',
       '#markup' =>
-        "<p>{$sup_syntax_text} <code><i>field_name</i> | <i>expression</i></code><br/><br/>{$where_text}<br/><code><strong>expression</strong> = <i>function_name</i>(<i>arguments</i>) | <i>int</i> | <i>string</i> | <i>JSONPath</i> | <i>expression</i> . <i>expression</i></code><br/><code><strong>arguments</strong> = <i>expression</i> [, <i>expression</i> [, <i>...</i>]]</code><br/><br/>{$func_list_text}<ul><li>"
-        . implode('</li><li>', array_keys(static::$available_str_func))
-        . "</li></ul><br/>{$example_text}</p>"
-      ,
+      "<p>{$sup_syntax_text} <code><i>field_name</i> | <i>expression</i></code><br/><br/>{$where_text}<br/><code><strong>expression</strong> = <i>function_name</i>(<i>arguments</i>) | <i>int</i> | <i>string</i> | <i>JSONPath</i> | <i>expression</i> . <i>expression</i></code><br/><code><strong>arguments</strong> = <i>expression</i> [, <i>expression</i> [, <i>...</i>]]</code><br/><br/>{$func_list_text}<ul><li>"
+      . implode('</li><li>', array_keys(static::$availableStrFunc))
+      . "</li></ul><br/>{$example_text}</p>",
     ];
     $form['help']['constant'] = [
       '#markup' => "<p></p>",
@@ -139,6 +142,9 @@ class StringJsonPath extends FMJsonPath {
    *   The raw data structure.
    * @param string $mapping
    *   The mapping to perform.
+   * @param array &$context
+   *   The array of context.
+   *
    * @return array
    *   The extracted value in an array.
    */
@@ -209,7 +215,7 @@ class StringJsonPath extends FMJsonPath {
                 || ('_' == $mapping[$strpos]))
               )
           ) {
-            $func .= $mapping[$strpos];          
+            $func .= $mapping[$strpos];
             ++$strpos;
           }
           // Syntax check.
@@ -217,7 +223,7 @@ class StringJsonPath extends FMJsonPath {
             throw new SyntaxError("Syntax error. Expression separator expected but function name ($func) found at position $strpos in mapping '$mapping'.");
           }
           // Check function is valid.
-          if (!array_key_exists($func, static::$available_str_func)) {
+          if (!array_key_exists($func, static::$availableStrFunc)) {
             // Syntax error, invalid function.
             throw new SyntaxError("Syntax error. Invalid function '$func' at position $strpos in mapping '$mapping'.");
           }
@@ -350,7 +356,8 @@ class StringJsonPath extends FMJsonPath {
       return reset($func_args_stack);
     }
     catch (StringJsonPathException $e) {
-fwrite(STDERR, "DEBUG: " . $e); //+debug
+      // +debug
+      fwrite(STDERR, "DEBUG: " . $e);
       \Drupal::logger('xnttstrjp')->error(
         "Failed to extract data: " . $e
       );
@@ -425,7 +432,7 @@ fwrite(STDERR, "DEBUG: " . $e); //+debug
     // $json_object carries state between the fields, so this is just
     // reconciling the output of mapping with the state building up in the
     // JSONPath interpreter.
-    //$raw_data = $context['jsonpath_object']->getValue();
+    // $raw_data = $context['jsonpath_object']->getValue();
     $raw_data = $data_object;
   }
 
diff --git a/tests/src/Unit/StringJsonPathTest.php b/tests/src/Unit/StringJsonPathTest.php
index 69f7d15..4342784 100644
--- a/tests/src/Unit/StringJsonPathTest.php
+++ b/tests/src/Unit/StringJsonPathTest.php
@@ -1,6 +1,5 @@
 <?php
 
-# namespace Drupal\Tests\xnttstrjp\Unit\Plugin\ExternalEntities\FieldMapper;
 namespace Drupal\Tests\xnttstrjp\Unit;
 
 use Drupal\Core\DependencyInjection\ContainerBuilder;
@@ -26,26 +25,34 @@ class StringJsonPathTest extends UnitTestCase {
   public function provideTestExtractValueFromRawDataUsingMapping() {
     return [
       // Direct mapping.
-      [32, ['bla' => 4, 'bli' => 32, ], 'bli'],
+      [32, ['bla' => 4, 'bli' => 32], 'bli'],
       // Constant.
-      ['bli', ['bla' => 4, 'bli' => 32, ], '+bli'],
+      ['bli', ['bla' => 4, 'bli' => 32], '+bli'],
       // Empty value.
-      ['', ['bla' => 4,], ''],
+      ['', ['bla' => 4], ''],
       // Static string value.
-      ['toto', ['bli' => 4,], '"toto"'],
+      ['toto', ['bli' => 4], '"toto"'],
       // Static integer value.
-      [42, ['bli' => 4,], '+42'],
+      [42, ['bli' => 4], '+42'],
       [-42, [], '-42'],
       // Concate.
       ["blibla", [], "'bli' . \"bla\""],
       // Basic JSON Path.
-      ['2', ['bla' => '2',], '$.bla'],
-      ['3', ['bla' => '3',], '$[\'bla\']'],
+      ['2', ['bla' => '2'], '$.bla'],
+      ['3', ['bla' => '3'], '$[\'bla\']'],
       // Basic String function.
       ['bliblubla', [], "substr('blobliblubla', 3)"],
       ['bliblu', [], "substr('blobliblubla', 3, 6)"],
       // JSON Path and functions combination.
-      ['blablabla', ['foo' => ['bar' => [42, 'bloblibluble']], 'baz' => 'bla'], "substr(str_replace('obli', 'abla', $.foo.bar.1), 0, strpos($.foo.bar.1, 'blu')) . $.baz"],
+      [
+        'blablabla', [
+          'foo' => [
+            'bar' => [42, 'bloblibluble'],
+          ],
+          'baz' => 'bla',
+        ],
+        "substr(str_replace('obli', 'abla', $.foo.bar.1), 0, strpos($.foo.bar.1, 'blu')) . $.baz",
+      ],
     ];
   }
 
@@ -58,45 +65,37 @@ class StringJsonPathTest extends UnitTestCase {
     $configuration = [];
     $plugin_id = 'x';
     $plugin_definition = [];
-    
+
     $logger = $this->getMockBuilder(LoggerChannelInterface::class)
       ->disableOriginalConstructor()
-      ->getMock()
-    ;
+      ->getMock();
     $logger->expects($this->any())
       ->method('error')
-      ->willReturn(NULL)
-    ;
+      ->willReturn(NULL);
     $logger_factory = $this->getMockBuilder(LoggerChannelFactoryInterface::class)
       ->disableOriginalConstructor()
-      ->getMock()
-    ;
+      ->getMock();
     $logger_factory
       ->expects($this->any())
       ->method('get')
       ->with('xnttstrjp')
-      ->willReturn($logger)
-    ;
+      ->willReturn($logger);
     $container = new ContainerBuilder();
     $container->set('logger.factory', $logger_factory);
     \Drupal::setContainer($container);
 
     $entity_type_manager = $this->getMockBuilder(EntityTypeManager::class)
       ->disableOriginalConstructor()
-      ->getMock()
-    ;
+      ->getMock();
     $entity_field_manager = $this->getMockBuilder(EntityFieldManagerInterface::class)
       // ->disableOriginalConstructor()
-      ->getMock()
-    ;
+      ->getMock();
     $typed_data_manager = $this->getMockBuilder(TypedDataManagerInterface::class)
       // ->disableOriginalConstructor()
-      ->getMock()
-    ;
+      ->getMock();
     $string_translation = $this->getMockBuilder(TranslationInterface::class)
       // ->disableOriginalConstructor()
-      ->getMock()
-    ;
+      ->getMock();
     $strjpath = new StringJsonPath($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $entity_field_manager, $typed_data_manager, $string_translation);
     $value = $strjpath->extractValueFromRawDataUsingMapping($data, $mapping);
     $this->assertEquals([$expected], $value, 'Failed with ');
@@ -133,21 +132,18 @@ class StringJsonPathTest extends UnitTestCase {
     $plugin_definition = [];
     $entity_type_manager = $this->getMockBuilder(EntityTypeManager::class)
       ->disableOriginalConstructor()
-      ->getMock()
-    ;
+      ->getMock();
     $entity_field_manager = $this->getMockBuilder(EntityFieldManagerInterface::class)
       // ->disableOriginalConstructor()
-      ->getMock()
-    ;
+      ->getMock();
     $typed_data_manager = $this->getMockBuilder(TypedDataManagerInterface::class)
       // ->disableOriginalConstructor()
-      ->getMock()
-    ;
+      ->getMock();
     $string_translation = $this->getMockBuilder(TranslationInterface::class)
       // ->disableOriginalConstructor()
-      ->getMock()
-    ;
-    $strjpath = new StringJsonPath($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $entity_field_manager, $typed_data_manager, $string_translation);
+      ->getMock();
+    // $strjpath =
+    new StringJsonPath($configuration, $plugin_id, $plugin_definition, $entity_type_manager, $entity_field_manager, $typed_data_manager, $string_translation);
     // $value = $strjpath->extractValueFromRawDataUsingMapping($data, $mapping);
     $this->markTestIncomplete(
       'This test has not been implemented yet.'