diff --git a/modules/jsonapi_file_upload/src/Routing/Routes.php b/modules/jsonapi_file_upload/src/Routing/Routes.php
index 2594c18..cccea86 100644
--- a/modules/jsonapi_file_upload/src/Routing/Routes.php
+++ b/modules/jsonapi_file_upload/src/Routing/Routes.php
@@ -10,8 +10,7 @@ use Symfony\Cmf\Component\Routing\RouteObjectInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\Routing\Route;
 use Symfony\Component\Routing\RouteCollection;
-use Drupal\jsonapi\Routing\Routes as JsonapiRoutes;
-
+use Drupal\jsonapi\Routing\Routes as JsonApiRoutes;
 
 /**
  * Defines dynamic routes.
@@ -75,14 +74,14 @@ class Routes implements ContainerInjectionInterface {
     $routes = new RouteCollection();
 
     foreach ($this->resourceTypeRepository->all() as $resource_type) {
-      $routes->addCollection($this->getFileUploadRoutesForResourceType($resource_type, $this->jsonApiBasePath));
+      $routes->addCollection($this->getFileUploadRoutesForResourceType($resource_type));
     }
 
     // Enable all available authentication providers.
     $routes->addOptions(['_auth' => $this->providerIds]);
 
     // Flag every route as belonging to the JSON API module.
-    $routes->addDefaults([JsonapiRoutes::JSON_API_ROUTE_FLAG_KEY => TRUE]);
+    $routes->addDefaults([JsonApiRoutes::JSON_API_ROUTE_FLAG_KEY => TRUE]);
 
     $routes->addRequirements(['_content_type_format' => 'bin']);
 
@@ -105,7 +104,7 @@ class Routes implements ContainerInjectionInterface {
   protected function getFileUploadRoutesForResourceType(ResourceType $resource_type) {
     $routes = new RouteCollection();
 
-    // Internal resources have no routes and individual routes require locations.
+    // Internal resources have no routes; individual routes require locations.
     if ($resource_type->isInternal() || !$resource_type->isLocatable()) {
       return $routes;
     }
diff --git a/modules/jsonapi_file_upload/src/Shim/FileUploader.php b/modules/jsonapi_file_upload/src/Shim/FileUploader.php
index cf93688..f31eb10 100644
--- a/modules/jsonapi_file_upload/src/Shim/FileUploader.php
+++ b/modules/jsonapi_file_upload/src/Shim/FileUploader.php
@@ -92,6 +92,8 @@ class FileUploader implements FileUploaderInterface {
   protected $lock;
 
   /**
+   * System file configuration.
+   *
    * @var \Drupal\Core\Config\ImmutableConfig
    */
   protected $systemFileConfig;
@@ -435,7 +437,7 @@ class FileUploader implements FileUploaderInterface {
   /**
    * Generates a lock ID based on the file URI.
    *
-   * @param $file_uri
+   * @param string $file_uri
    *   The file URI.
    *
    * @return string
diff --git a/modules/jsonapi_file_upload/src/Shim/FileUploaderInterface.php b/modules/jsonapi_file_upload/src/Shim/FileUploaderInterface.php
index 2f5b098..4854f58 100644
--- a/modules/jsonapi_file_upload/src/Shim/FileUploaderInterface.php
+++ b/modules/jsonapi_file_upload/src/Shim/FileUploaderInterface.php
@@ -2,14 +2,11 @@
 
 namespace Drupal\jsonapi_file_upload\Shim;
 
-use Drupal\Core\Cache\CacheableDependencyInterface;
-use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Session\AccountInterface;
-use Symfony\Component\HttpFoundation\Request;
 
 /**
- * Interface to handle binary file data uploads and corresponding file entity creation.
+ * Interface to handle binary file data uploads and file entity creation.
  *
  * This is implemented at the field-level for the following reasons:
  *   - Validation for uploaded files is tied to fields (allowed extensions, max