diff --git a/bin/addpkg b/bin/addpkg
index 7ca2125..58820cd 100644
--- a/bin/addpkg
+++ b/bin/addpkg
@@ -44,7 +44,7 @@ syslog.addHandler(stderr_handler)
 
 
 # ========== Main Script ==========
-if __name__ == "__main__":
+def main():
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "-c", "--cachedir", help="alternative directory to use for moving package"
@@ -116,3 +116,7 @@ if __name__ == "__main__":
 
     for pkgfile in (*pkg_tarballs, *sigfiles):
         pkgfiles.add(pkgfile, cachedir)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/bin/delpkg b/bin/delpkg
index 777cffb..9420140 100644
--- a/bin/delpkg
+++ b/bin/delpkg
@@ -42,7 +42,7 @@ syslog.addHandler(stderr_handler)
 
 
 # ========== Main Script ==========
-if __name__ == "__main__":
+def main():
     parser = argparse.ArgumentParser()
     parser.add_argument(
         "-c", "--cachedir", help="alternative directory to use for deleting package"
@@ -109,3 +109,7 @@ if __name__ == "__main__":
             repos.db_modify("remove", db, *opts, *pkgs)
         except repos.RepoAddError as e:
             syslog.error(e)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/bin/fqo b/bin/fqo
index 96f5ddd..dc2c17a 100644
--- a/bin/fqo
+++ b/bin/fqo
@@ -51,17 +51,22 @@ def locate_files(patterns):
 
 
 # ========== Main Script ==========
-parser = argparse.ArgumentParser()
-parser.add_argument("patterns", nargs="+", help="file pattern to search for")
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("patterns", nargs="+", help="file pattern to search for")
 
-args = parser.parse_args()
+    args = parser.parse_args()
 
-try:
-    files = locate_files(args.patterns)
-# Locate binary is optional for package, but required for script
-except FileNotFoundError:
-    print("locate binary not found, install and re-run script")
-else:
-    selected_file = run_fzf(files)
+    try:
+        files = locate_files(args.patterns)
+    # Locate binary is optional for package, but required for script
+    except FileNotFoundError:
+        print("locate binary not found, install and re-run script")
+    else:
+        selected_file = run_fzf(files)
 
-subprocess.run([PACMAN_CMD, "-Qo", selected_file])
+    subprocess.run([PACMAN_CMD, "-Qo", selected_file])
+
+
+if __name__ == "__main__":
+    main()
diff --git a/bin/pug2 b/bin/pug2
index ac7e8d2..7d02d6b 100644
--- a/bin/pug2
+++ b/bin/pug2
@@ -75,7 +75,7 @@ def package_lists_match(gist_id, package_list):
 
 
 # ========== Main Script ==========
-if __name__ == "__main__":
+def main():
     parser = argparse.ArgumentParser(description=DESCRIPTION)
     parser.add_argument(
         "-c",
@@ -146,3 +146,7 @@ if __name__ == "__main__":
             sys.exit(e.returncode)
         else:
             print("Update complete.")
+
+
+if __name__ == "__main__":
+    main()