diff --git a/silkaj/money.py b/silkaj/money.py
index 6e307125b6cd36d1cf891f254a05bdf0312ab4dd..c8ac2fcc9812b8585d18e2e0651a57f2efa5e345 100644
--- a/silkaj/money.py
+++ b/silkaj/money.py
@@ -15,10 +15,11 @@
 
 import functools
 import sys
+from typing import List, Tuple, Union
 
-from click import argument, command, echo, pass_context
+from click import Context, argument, command, echo, pass_context
 from duniterpy.api.bma import blockchain, tx
-from duniterpy.documents.transaction import InputSource
+from duniterpy.documents.transaction import InputSource, OutputSource
 from tabulate import tabulate
 
 from silkaj import wot_tools as wt
@@ -33,7 +34,7 @@ from silkaj.tui import display_amount, gen_pubkey_checksum
 @command("balance", help="Get wallet balance")
 @argument("pubkeys", nargs=-1)
 @pass_context
-def cmd_amount(ctx, pubkeys):
+def cmd_amount(ctx: Context, pubkeys: str) -> None:
     if not has_auth_method():
 
         # check input pubkeys
@@ -41,12 +42,15 @@ def cmd_amount(ctx, pubkeys):
             sys.exit("You should specify one or many pubkeys")
         pubkeys_list = list()
         wrong_pubkeys = False
-        for inputPubkey in pubkeys:
-            pubkey = is_pubkey_and_check(inputPubkey)
-            if not pubkey:
+        for input_pubkey in pubkeys:
+            checked_pubkey = is_pubkey_and_check(input_pubkey)
+            if checked_pubkey:
+                pubkey = str(checked_pubkey)
+            else:
+                pubkey = input_pubkey
                 wrong_pubkeys = True
-                print(f"ERROR: pubkey {inputPubkey} has a wrong format")
-            elif pubkey in pubkeys_list:
+                print(f"ERROR: pubkey {pubkey} has a wrong format")
+            if pubkey in pubkeys_list:
                 sys.exit(
                     f"ERROR: pubkey {gen_pubkey_checksum(pubkey)} was specified many times"
                 )
@@ -68,7 +72,7 @@ def cmd_amount(ctx, pubkeys):
         show_amount_from_pubkey(pubkey, get_amount_from_pubkey(pubkey))
 
 
-def show_amount_from_pubkey(label, inputs_balance):
+def show_amount_from_pubkey(label: str, inputs_balance: List[int]) -> None:
     """
     Shows the balance of a pubkey.
     `label` can be either a pubkey or "Total".
@@ -78,7 +82,7 @@ def show_amount_from_pubkey(label, inputs_balance):
     currency_symbol = get_currency_symbol()
     ud_value = get_ud_value()
     average, monetary_mass = get_average()
-    member = False
+    member = None
 
     # if `pubkey` is a pubkey, get pubkey:checksum and uid
     if label != "Total":
@@ -110,7 +114,7 @@ def show_amount_from_pubkey(label, inputs_balance):
     echo(tabulate(display, tablefmt="fancy_grid"))
 
 
-def get_average():
+def get_average() -> Tuple[int, int]:
     head = get_head_block()
     monetary_mass = head["monetaryMass"]
     members_count = head["membersCount"]
@@ -118,16 +122,16 @@ def get_average():
     return average, monetary_mass
 
 
-def get_amount_from_pubkey(pubkey):
+def get_amount_from_pubkey(pubkey: str) -> List[int]:
     listinput, amount = get_sources(pubkey)
 
     totalAmountInput = 0
     for input in listinput:
         totalAmountInput += amount_in_current_base(input)
-    return totalAmountInput, amount
+    return [totalAmountInput, amount]
 
 
-def get_sources(pubkey):
+def get_sources(pubkey: str) -> Tuple[List[InputSource], int]:
     client = client_instance()
     # Sources written into the blockchain
     sources = client(tx.sources, pubkey)
@@ -182,7 +186,7 @@ def get_sources(pubkey):
 
 
 @functools.lru_cache(maxsize=1)
-def get_ud_value():
+def get_ud_value() -> int:
     client = client_instance()
     blockswithud = client(blockchain.ud)
     NBlastUDblock = blockswithud["result"]["blocks"][-1]
@@ -190,7 +194,7 @@ def get_ud_value():
     return lastUDblock["dividend"] * 10 ** lastUDblock["unitbase"]
 
 
-def amount_in_current_base(source):
+def amount_in_current_base(source: Union[InputSource, OutputSource]) -> int:
     """
     Get amount in current base from input or output source
     """