diff --git a/dlunch/__init__.py b/dlunch/__init__.py
index b83a805..2b9f205 100755
--- a/dlunch/__init__.py
+++ b/dlunch/__init__.py
@@ -1,25 +1,18 @@
 """Main Data-Lunch package."""
 
 import importlib.resources
-import pathlib
-import hydra
 import logging
 import panel as pn
 from omegaconf import DictConfig, OmegaConf
 
-# Database imports
+# Relative imports
 from . import models
-
-# Other Data-Lunch imports
 from . import core
+from .core import __version__
 from . import gui
 from . import auth
 from .auth import pn_user
 
-# App metadata
-__version__ = "3.3.0"
-"""str: Data-Lunch version."""
-
 # LOGGER ----------------------------------------------------------------------
 log = logging.getLogger(__name__)
 """Logger: module logger."""
diff --git a/dlunch/cli.py b/dlunch/cli.py
index 7dcad70..83a1b36 100755
--- a/dlunch/cli.py
+++ b/dlunch/cli.py
@@ -1,3 +1,11 @@
+"""Module with Data-Lunch's command line.
+
+The command line is built with ``click``.
+
+Call ``data-lunch --help`` from the terminal inside an environment where the
+``dlunch`` package is installed.
+"""
+
 import click
 import pkg_resources
 from hydra import compose, initialize
diff --git a/dlunch/core.py b/dlunch/core.py
index a8c30c9..14de893 100644
--- a/dlunch/core.py
+++ b/dlunch/core.py
@@ -1,11 +1,10 @@
+import cryptography.fernet
 import panel as pn
 import pandas as pd
 import pathlib
 import logging
 import socket
 import subprocess
-from . import __version__
-from . import models
 from omegaconf import DictConfig, OmegaConf
 from openpyxl.utils import get_column_interval
 from openpyxl.styles import Alignment, Font
@@ -20,12 +19,14 @@
 from time import sleep
 
 # Graphic interface imports (after class definition)
+from . import models
 from . import gui
-
-# Authentication
 from . import auth
 from .auth import pn_user
-import cryptography.fernet
+
+# APP METADATA ----------------------------------------------------------------
+__version__ = "3.3.0"
+"""str: Data-Lunch version."""
 
 # LOGGER ----------------------------------------------------------------------
 log = logging.getLogger(__name__)
diff --git a/dlunch/gui.py b/dlunch/gui.py
index 4be808f..3a59b25 100644
--- a/dlunch/gui.py
+++ b/dlunch/gui.py
@@ -19,6 +19,7 @@
 from . import auth
 from .auth import pn_user
 
+# LOGGER ----------------------------------------------------------------------
 log = logging.getLogger(__name__)
 
 
diff --git a/pyproject.toml b/pyproject.toml
index 9ca3a7e..b3af42a 100755
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,7 +54,7 @@ exclude = '''
 name = "cz_conventional_commits"
 version = "3.3.0"
 version_files = [
-    "dlunch/__init__.py",
+    "dlunch/core.py",
     "pyproject.toml:version",
     "docs/conf.py:release",
 ]