diff --git a/pwm/pwm.py b/pwm/pwm.py
index bda24c83838eeaaf726323d8c4750f825e55143e..da6e5b0c9f6f214d99a88bb8289d10d519feb08f 100755
--- a/pwm/pwm.py
+++ b/pwm/pwm.py
@@ -253,7 +253,6 @@ class Gitlab:
                 print("Error retrieving members: " + members["message"])
                 exit(1)
 
-            ssh_url_to_repo = repo["ssh_url_to_repo"]
             web_url = repo["web_url"]
             members_names = ""
 
@@ -337,7 +336,7 @@ def command_clone_all(args):
 
 def command_list_projects(args):
     gl = Gitlab(args.token)
-    projects = gl.get_projects_in_group(args.id)
+    projects = gl.get_projects_in_group(args.group_id)
     if args.show:
         if args.show == "all":
             print(json.dumps(projects, indent=2))
@@ -361,7 +360,7 @@ def command_list_projects(args):
 
 def command_list_users(args):
     gl = Gitlab(args.token)
-    members = gl.get_users_in_repository(args.id)
+    members = gl.get_users_in_repository(args.project_id)
     if args.show:
         if args.show == "all":
             print(json.dumps(members, indent=2))
@@ -423,15 +422,9 @@ def main():
 
     parser_clone = subparsers.add_parser("clone", help="Clone the repositories locally")
     group_clone = parser_clone.add_mutually_exclusive_group()
-    group_clone.add_argument(
-        "-g",
-        "--group",
-        action="store_true",
-        help="Clone repositories from a group (with group_id) (default behavior).",
-    )
     parser_clone.add_argument(
-        "id",
-        metavar="ID",
+        "group_id",
+        metavar="GROUP_ID",
         help="The group_id (int) of the projects.",
     )
     parser_clone.add_argument(
@@ -454,7 +447,7 @@ def main():
     parser_list = subparsers.add_parser(
         "list_projects", help="List all project in a group"
     )
-    parser_list.add_argument("id", metavar="ID", help="The group_id (int).")
+    parser_list.add_argument("group_id", metavar="GROUP_ID", help="The group_id (int).")
     parser_list.add_argument(
         "-s",
         "--show",
@@ -466,7 +459,7 @@ def main():
         "list_users", help="List all users in a repository"
     )
     parser_list.add_argument(
-        "id", metavar="ID", help="The repository project_id (int)."
+        "project_id", metavar="PROJECT_ID", help="The repository project_id (int)."
     )
     parser_list.add_argument(
         "-s",
@@ -481,6 +474,11 @@ def main():
         if os.environ.get("GITEDU_TOKEN"):
             args.token = os.environ.get("GITEDU_TOKEN")
         else:
+            token_file = os.environ.get("HOME", "") + "/.config/gitedu_token"
+            if os.path.isfile(token_file):
+                with open(token_file) as file:
+                    args.token = file.read().strip()
+        if args.token is None:
             print(
                 "Error: you must give a valid api token. Create a token here: "
                 + TOKEN_URL