diff --git a/packages/types/src/primitive/Data.ts b/packages/types/src/primitive/Data.ts
index 074933d7e4..eb5bb8249a 100644
--- a/packages/types/src/primitive/Data.ts
+++ b/packages/types/src/primitive/Data.ts
@@ -11,6 +11,7 @@ import { createType } from '../codec/create/createType';
 import Bytes from './Bytes';
 import H256 from './H256';
 
+/** @internal */
 function decodeDataU8a (registry: Registry, value: Uint8Array): [any, number | undefined] {
   if (!value.length) {
     return [undefined, undefined];
@@ -33,6 +34,7 @@ function decodeDataU8a (registry: Registry, value: Uint8Array): [any, number | u
   throw new Error(`Unable to decode Data, invalid indicator byte ${indicator}`);
 }
 
+/** @internal */
 function decodeData (registry: Registry, value?: Record<string, any> | Uint8Array | Enum | string): [any, number | undefined] {
   if (!value) {
     return [undefined, undefined];
diff --git a/packages/types/src/primitive/Generic/Call.ts b/packages/types/src/primitive/Generic/Call.ts
index 9fb6748b52..743211f97c 100644
--- a/packages/types/src/primitive/Generic/Call.ts
+++ b/packages/types/src/primitive/Generic/Call.ts
@@ -21,6 +21,84 @@ interface DecodedMethod extends DecodeMethodInput {
   meta: FunctionMetadataLatest;
 }
 
+/**
+ * Get a mapping of `argument name -> argument type` for the function, from
+ * its metadata.
+ *
+ * @param meta - The function metadata used to get the definition.
+ * @internal
+ */
+function getArgsDef (registry: Registry, meta: FunctionMetadataLatest): ArgsDef {
+  // eslint-disable-next-line @typescript-eslint/no-use-before-define
+  return Call.filterOrigin(meta).reduce((result, { name, type }): ArgsDef => {
+    const Type = getTypeClass(registry, getTypeDef(type.toString()));
+    result[name.toString()] = Type;
+
+    return result;
+  }, {} as ArgsDef);
+}
+
+/** @internal */
+function decodeCallViaObject (registry: Registry, value: DecodedMethod, _meta?: FunctionMetadataLatest): DecodedMethod {
+  // we only pass args/methodsIndex out
+  const { args, callIndex } = value;
+
+  // Get the correct lookupIndex
+  // eslint-disable-next-line @typescript-eslint/no-use-before-define
+  const lookupIndex = callIndex instanceof CallIndex
+    ? callIndex.toU8a()
+    : callIndex;
+
+  // Find metadata with callIndex
+  const meta = _meta || registry.findMetaCall(lookupIndex).meta;
+
+  return {
+    args,
+    argsDef: getArgsDef(registry, meta),
+    meta,
+    callIndex
+  };
+}
+
+/** @internal */
+function decodeCallViaU8a (registry: Registry, value: Uint8Array, _meta?: FunctionMetadataLatest): DecodedMethod {
+  // We need 2 bytes for the callIndex
+  const callIndex = new Uint8Array(2);
+
+  callIndex.set(value.subarray(0, 2), 0);
+
+  // Find metadata with callIndex
+  const meta = _meta || registry.findMetaCall(callIndex).meta;
+
+  return {
+    args: value.subarray(2),
+    argsDef: getArgsDef(registry, meta),
+    callIndex,
+    meta
+  };
+}
+
+/**
+ * Decode input to pass into constructor.
+ *
+ * @param value - Value to decode, one of:
+ * - hex
+ * - Uint8Array
+ * - {@see DecodeMethodInput}
+ * @param _meta - Metadata to use, so that `injectMethods` lookup is not
+ * necessary.
+ * @internal
+ */
+function decodeCall (registry: Registry, value: DecodedMethod | Uint8Array | string = new Uint8Array(), _meta?: FunctionMetadataLatest): DecodedMethod {
+  if (isHex(value) || isU8a(value)) {
+    return decodeCallViaU8a(registry, u8aToU8a(value), _meta);
+  } else if (isObject(value) && value.callIndex && value.args) {
+    return decodeCallViaObject(registry, value, _meta);
+  }
+
+  throw new Error(`Call: Cannot decode value '${value}' of type ${typeof value}`);
+}
+
 /**
  * @name CallIndex
  * @description
@@ -42,7 +120,7 @@ export default class Call extends Struct implements IMethod {
   protected _meta: FunctionMetadataLatest;
 
   constructor (registry: Registry, value: any, meta?: FunctionMetadataLatest) {
-    const decoded = Call.decodeCall(registry, value, meta);
+    const decoded = decodeCall(registry, value, meta);
 
     super(registry, {
       callIndex: CallIndex,
@@ -52,66 +130,6 @@ export default class Call extends Struct implements IMethod {
     this._meta = decoded.meta;
   }
 
-  /**
-   * Decode input to pass into constructor.
-   *
-   * @param value - Value to decode, one of:
-   * - hex
-   * - Uint8Array
-   * - {@see DecodeMethodInput}
-   * @param _meta - Metadata to use, so that `injectMethods` lookup is not
-   * necessary.
-   * @internal
-   */
-  private static decodeCall (registry: Registry, value: DecodedMethod | Uint8Array | string = new Uint8Array(), _meta?: FunctionMetadataLatest): DecodedMethod {
-    if (isHex(value) || isU8a(value)) {
-      return Call.decodeCallViaU8a(registry, u8aToU8a(value), _meta);
-    } else if (isObject(value) && value.callIndex && value.args) {
-      return Call.decodeCallViaObject(registry, value, _meta);
-    }
-
-    throw new Error(`Call: Cannot decode value '${value}' of type ${typeof value}`);
-  }
-
-  /** @internal */
-  private static decodeCallViaObject (registry: Registry, value: DecodedMethod, _meta?: FunctionMetadataLatest): DecodedMethod {
-    // we only pass args/methodsIndex out
-    const { args, callIndex } = value;
-
-    // Get the correct lookupIndex
-    const lookupIndex = callIndex instanceof CallIndex
-      ? callIndex.toU8a()
-      : callIndex;
-
-    // Find metadata with callIndex
-    const meta = _meta || registry.findMetaCall(lookupIndex).meta;
-
-    return {
-      args,
-      argsDef: Call.getArgsDef(registry, meta),
-      meta,
-      callIndex
-    };
-  }
-
-  /** @internal */
-  private static decodeCallViaU8a (registry: Registry, value: Uint8Array, _meta?: FunctionMetadataLatest): DecodedMethod {
-    // We need 2 bytes for the callIndex
-    const callIndex = new Uint8Array(2);
-
-    callIndex.set(value.subarray(0, 2), 0);
-
-    // Find metadata with callIndex
-    const meta = _meta || registry.findMetaCall(callIndex).meta;
-
-    return {
-      args: value.subarray(2),
-      argsDef: Call.getArgsDef(registry, meta),
-      callIndex,
-      meta
-    };
-  }
-
   // If the extrinsic function has an argument of type `Origin`, we ignore it
   public static filterOrigin (meta?: FunctionMetadataLatest): FunctionArgumentMetadataLatest[] {
     // FIXME should be `arg.type !== Origin`, but doesn't work...
@@ -122,22 +140,6 @@ export default class Call extends Struct implements IMethod {
       : [];
   }
 
-  /**
-   * Get a mapping of `argument name -> argument type` for the function, from
-   * its metadata.
-   *
-   * @param meta - The function metadata used to get the definition.
-   * @internal
-   */
-  private static getArgsDef (registry: Registry, meta: FunctionMetadataLatest): ArgsDef {
-    return Call.filterOrigin(meta).reduce((result, { name, type }): ArgsDef => {
-      const Type = getTypeClass(registry, getTypeDef(type.toString()));
-      result[name.toString()] = Type;
-
-      return result;
-    }, {} as ArgsDef);
-  }
-
   /**
    * @description The arguments for the function call
    */
@@ -150,7 +152,7 @@ export default class Call extends Struct implements IMethod {
    * @description The argument definitions
    */
   public get argsDef (): ArgsDef {
-    return Call.getArgsDef(this.registry, this.meta);
+    return getArgsDef(this.registry, this.meta);
   }
 
   /**
diff --git a/packages/types/src/primitive/IdentityFields.ts b/packages/types/src/primitive/IdentityFields.ts
index 900fe24799..450c5d3d31 100644
--- a/packages/types/src/primitive/IdentityFields.ts
+++ b/packages/types/src/primitive/IdentityFields.ts
@@ -10,6 +10,7 @@ import { isString, isU8a, u8aToU8a } from '@polkadot/util';
 import Set from '../codec/Set';
 import { createType } from '../codec/create/createType';
 
+/** @internal */
 function decodeFields (registry: Registry, value?: any): any {
   if (isString(value)) {
     return decodeFields(registry, u8aToU8a(value.toString()));
@@ -20,6 +21,11 @@ function decodeFields (registry: Registry, value?: any): any {
   return value;
 }
 
+/**
+ * @name IdentityFields
+ * @description
+ * Encoder/Decoder class fo registry IdentityFields
+ */
 export default class IdentityFields extends Set {
   constructor (registry: Registry, value?: any) {
     super(registry, {