diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d3102d..f0a3e7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 ### Changed
+- CLI messages updated
+- CLI modified
 - `README.md` updated
 - `Python 3.14` added to `test.yml`
 - Test system modified
diff --git a/reserver/__init__.py b/reserver/__init__.py
index e89d5b9..9a58254 100644
--- a/reserver/__init__.py
+++ b/reserver/__init__.py
@@ -5,3 +5,5 @@
 from .errors import ReserverBaseError
 
 __version__ = RESERVER_VERSION
+
+__all__ = ["PyPIUploader", "ReserverBaseError"]
diff --git a/reserver/__main__.py b/reserver/__main__.py
index 075a785..1be93fa 100644
--- a/reserver/__main__.py
+++ b/reserver/__main__.py
@@ -2,17 +2,13 @@
 """Reserver main."""
 import argparse
 from art import tprint
-from .params import RESERVER_VERSION
+from .params import RESERVER_VERSION, EXIT_MESSAGE
 from .functions import reserver_help
 from .uploader import PyPIUploader
 
 
-def main():
-    """
-    CLI main function.
-
-    :return: None
-    """
+def _parse_args():
+    """Parse arguments."""
     parser = argparse.ArgumentParser()
     parser.add_argument(
         '--name',
@@ -39,6 +35,16 @@ def main():
     parser.add_argument('--version', help="version", action='store_true', default=False)
     parser.add_argument('-v', help="version", action='store_true', default=False)
     args = parser.parse_known_args()[0]
+    return args
+
+
+def _run(args):
+    """
+    Run reserver CLI.
+
+    :param args: arguments
+    :type args: argparse.Namespace
+    """
     if args.version or args.v:
         print(RESERVER_VERSION)
         return
@@ -55,5 +61,18 @@ def main():
         parser.print_help()
 
 
+def main():
+    """
+    CLI main function.
+
+    :return: None
+    """
+    try:
+        args = _parse_args()
+        _run(args)
+    except (KeyboardInterrupt, EOFError):
+        print(EXIT_MESSAGE)
+
+
 if __name__ == "__main__":
     main()
diff --git a/reserver/params.py b/reserver/params.py
index 008709a..f9a0521 100644
--- a/reserver/params.py
+++ b/reserver/params.py
@@ -28,3 +28,5 @@
 
 MAIN_PYPI_REVOKE_TOKEN_MESSAGE = "Security Tip: Please consider revoking your PyPI token from https://pypi.org/manage/account/token if no longer needed."
 TEST_PYPI_REVOKE_TOKEN_MESSAGE = "Security Tip: Please consider revoking your test PyPI token from https://test.pypi.org/manage/account/token if no longer needed."
+
+EXIT_MESSAGE = "See you. Bye!"