diff --git a/src/codecs/codec.js b/src/codecs/codec.js
index c1bd94aa..ae3059e4 100644
--- a/src/codecs/codec.js
+++ b/src/codecs/codec.js
@@ -1,16 +1,31 @@
 // @ts-check
 
+/**
+ * @template {number} Code
+ * @template T
+ * @typedef {import('./interface').BlockCodec<Code, T>} BlockCodec
+ */
+/**
+ * @template {number} Code
+ * @template T
+ * @typedef {import('./interface').BlockEncoder<Code, T>} BlockEncoder
+ */
+/**
+ * @template {number} Code
+ * @template T
+ * @typedef {import('./interface').BlockDecoder<Code, T>} BlockDecoder
+ */
+
 /**
  * @template {string} Name
  * @template {number} Code
  * @template T
- *
  * @param {Object} options
  * @param {Name} options.name
  * @param {Code} options.code
  * @param {(data:T) => Uint8Array} options.encode
  * @param {(bytes:Uint8Array) => T} options.decode
- * @returns {import('./interface').BlockCodec<Code, T>}
+ * @returns {BlockCodec<Code, T> & { encoder: BlockEncoder<Code, T>, decoder: BlockDecoder<Code, T> }}
  */
 export const codec = ({ name, code, decode, encode }) => {
   const decoder = new Decoder(name, code, decode)
@@ -19,12 +34,6 @@ export const codec = ({ name, code, decode, encode }) => {
   return { name, code, decode, encode, decoder, encoder }
 }
 
-/**
- * @template {number} Code
- * @template T
- * @typedef {import('./interface').BlockEncoder<Code, T>} BlockEncoder
- */
-
 /**
  * @class
  * @template T
@@ -45,12 +54,6 @@ export class Encoder {
   }
 }
 
-/**
- * @template {number} Code
- * @template T
- * @typedef {import('./interface').BlockDecoder<Code, T>} BlockDecoder
- */
-
 /**
  * @class
  * @template {number} Code
diff --git a/src/codecs/interface.ts b/src/codecs/interface.ts
index e7a98b52..e6cb6564 100644
--- a/src/codecs/interface.ts
+++ b/src/codecs/interface.ts
@@ -20,14 +20,11 @@ export interface BlockDecoder<Code extends number, T> {
  * separate those capabilties as sender requires encoder and receiver
  * requires decoder.
  */
-export interface BlockCodec<Code extends number, T> extends BlockEncoder<Code, T>, BlockDecoder<Code, T> {
-  encoder: BlockEncoder<Code, T>,
-  decoder: BlockDecoder<Code, T>
-}
+export interface BlockCodec<Code extends number, T> extends BlockEncoder<Code, T>, BlockDecoder<Code, T> {}
 
 
-// This just a hack to retain type information abouth the data that
-// is incoded `T`  Because it's a union `data` field is never going
+// This just a hack to retain type information about the data that
+// is encoded `T`  Because it's a union `data` field is never going
 // to be usable anyway.
 export type ByteView<T> =
   | Uint8Array