diff --git a/bob/bio/base/database/__init__.py b/bob/bio/base/database/__init__.py
index 2e8ecb4b0d9ec6087f0b889f871779b2d541bf28..ef307f82c34847a6668c662a9345aecaae6337f3 100644
--- a/bob/bio/base/database/__init__.py
+++ b/bob/bio/base/database/__init__.py
@@ -2,8 +2,7 @@ from .file import BioFile
 from .file import BioFileSet
 from .database import BioDatabase
 from .database import ZTBioDatabase
-from .filelist.query import FileListBioDatabase
-from .filelist.models import Client
+from .filelist import FileListBioDatabase
 from . import filelist
 
 # gets sphinx autodoc done right - don't remove it
@@ -27,7 +26,6 @@ __appropriate__(
     BioFileSet,
     BioDatabase,
     ZTBioDatabase,
-    FileListBioDatabase,
-    Client,
+    FileListBioDatabase
 )
 __all__ = [_ for _ in dir() if not _.startswith('_')]
diff --git a/bob/bio/base/database/file.py b/bob/bio/base/database/file.py
index 7fecf51a50f5e4dfb94d25825ae635d6b9df22b0..25f671d13f25487d5be9cfa302867755b51c18a9 100644
--- a/bob/bio/base/database/file.py
+++ b/bob/bio/base/database/file.py
@@ -5,21 +5,24 @@ import bob.db.base
 
 
 class BioFile(bob.db.base.File):
-    """A simple base class that defines basic properties of File object for the use in verification experiments"""
+    """A simple base class that defines basic properties of File object for the use in verification experiments
 
-    def __init__(self, client_id, path, file_id=None):
-        """**Constructor Documentation**
+    Parameters
+    ----------
+
+    client_id : object
+      The id of the client this file belongs to.
+      Its type depends on your implementation.
+      If you use an SQL database, this should be an SQL type like Integer or String.
 
-        Initialize the File object with the minimum required data.
+    file_id : object
+      see :py:class:`bob.db.base.File` constructor
 
-        Parameters:
+    path : object
+      see :py:class:`bob.db.base.File` constructor
+    """
 
-        client_id : various type
-          The id of the client this file belongs to.
-          Its type depends on your implementation.
-          If you use an SQL database, this should be an SQL type like Integer or String.
-        For path and file_id, please refer to :py:class:`bob.db.base.File` constructor
-        """
+    def __init__(self, client_id, path, file_id=None):
         bob.db.base.File.__init__(self, path, file_id)
 
         # just copy the information
@@ -34,18 +37,18 @@ class BioFileSet(BioFile):
     type :py:class:`bob.bio.base.database.BioFile` of the same client.
     The file set id can be anything hashable, but needs to be unique all over the database.
 
-    **Parameters:**
+    Parameters
+    ----------
 
     file_set_id : str or int
       A unique ID that identifies the file set.
+
     files : [:py:class:`bob.bio.base.database.BioFile`]
       A non-empty list of BioFile objects that should be stored inside this file.
       All files of that list need to have the same client ID.
     """
 
     def __init__(self, file_set_id, files, path=None):
-        """The list of :py:class:`bob.bio.base.database.BioFile` objects stored in this file set"""
-
         # don't accept empty file lists
         assert len(files), "Cannot create an empty BioFileSet"
 
diff --git a/bob/bio/base/database/filelist/__init__.py b/bob/bio/base/database/filelist/__init__.py
index 5067e4c9719d5b8edab6d382731811419f828938..8818c24ece0279a01eade4d638ccedbff45765a2 100644
--- a/bob/bio/base/database/filelist/__init__.py
+++ b/bob/bio/base/database/filelist/__init__.py
@@ -1,4 +1,4 @@
-from .models import ListReader, Client, FileListFile
+from .models import FileListFile
 from .query import FileListBioDatabase
 from .driver import Interface
 
@@ -20,8 +20,6 @@ def __appropriate__(*args):
 
 
 __appropriate__(
-    ListReader,
-    Client,
     FileListFile,
     FileListBioDatabase,
     Interface,
diff --git a/bob/bio/base/database/filelist/models.py b/bob/bio/base/database/filelist/models.py
index bb1cc21a28d3d2c67909c2594afd5af2ac1bf26d..f5507f877796c63efe2cee143304bade57ed9df0 100644
--- a/bob/bio/base/database/filelist/models.py
+++ b/bob/bio/base/database/filelist/models.py
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """
-This file defines simple Client and File interfaces that are comparable with other bob.db databases.
+This file defines a simple interface that are comparable with other bob.db databases.
 """
 
 import os
@@ -26,16 +26,6 @@ import fileinput
 import re
 
 
-class Client(object):
-    """
-    The clients of this database contain ONLY client ids. Nothing special.
-    """
-
-    def __init__(self, client_id):
-        self.id = client_id
-        """The ID of the client, which is stored as a :py:class:`str` object."""
-
-
 class FileListFile(object):
     """
      Initialize the File object with the minimum required data.
@@ -43,16 +33,19 @@ class FileListFile(object):
      If the ``model_id`` is not specified, ``model_id`` and ``client_id`` are identical.
      If the ``claimed_id`` is not specified, it is expected to be the ``client_id``.
 
-     **Parameters**
+     Parameters
+     ----------
 
      client_id : various type
        The id of the client, this file belongs to.
        The type of it is dependent on your implementation.
        If you use an SQL database, this should be an SQL type like Integer or String.
+
      path : str
        The path of this file, relative to the basic directory.
        If you use an SQL database, this should be the SQL type String.
        Please do not specify any file extensions.
+
      file_id : various type
        The id of the file.
        The type of it is dependent on your implementation.
diff --git a/bob/bio/base/database/filelist/query.py b/bob/bio/base/database/filelist/query.py
index 3d3c4f115f29f1c0fd32192ebe4cea30dd6602bc..2d6eaf1399d63608f3ea6f49564ee7bf507f23f1 100644
--- a/bob/bio/base/database/filelist/query.py
+++ b/bob/bio/base/database/filelist/query.py
@@ -8,13 +8,14 @@ import bob.db.base
 from .. import ZTBioDatabase
 from .. import BioFile
 
-from . import ListReader, Client
+from .models import ListReader
 
 
 class FileListBioDatabase(ZTBioDatabase):
     """This class provides a user-friendly interface to databases that are given as file lists.
 
-    Keyword parameters:
+    Parameters
+    ----------
 
     filelists_directory : str
       The directory that contains the filelists defining the protocol(s). If you use the protocol
@@ -27,65 +28,66 @@ class FileListBioDatabase(ZTBioDatabase):
     protocol : str
       The protocol of the database. This should be a folder inside ``filelists_directory``.
 
-    bio_file_class : class
-      The class that should be used for return the files.
-      This can be `BioFile`, `AudioBioFile`, `FaceBioFile`, or anything similar.
+    bio_file_class : ``class``
+      The class that should be used to return the files.
+      This can be :py:class:`bob.bio.base.database.BioFile`, :py:class:`bob.bio.spear.database.AudioBioFile`, :py:class:`bob.bio.face.database.FaceBioFile`, or anything similar.
 
     original_directory : str or ``None``
-      The directory, where the original data can be found
+      The directory, where the original data can be found.
 
     original_extension : str or [str] or ``None``
-      The filename extension of the original data, or multiple extensions
+      The filename extension of the original data, or multiple extensions.
 
     annotation_directory : str or ``None``
-      The directory, where additional annotation files can be found
+      The directory, where additional annotation files can be found.
 
     annotation_extension : str or ``None``
-      The filename extension of the annoation files
+      The filename extension of the annotation files.
 
     annotation_type : str or ``None``
       The type of annotation that can be read.
-      Currently, options are 'eyecenter', 'named', 'idiap'.
+      Currently, options are ``'eyecenter', 'named', 'idiap'``.
       See :py:func:`bob.db.base.read_annotation_file` for details.
 
     dev_sub_directory : str or ``None``
-      Specify a custom subdirectory for the filelists of the development set (default is 'dev')
+      Specify a custom subdirectory for the filelists of the development set (default is ``'dev'``)
 
     eval_sub_directory : str or ``None``
-      Specify a custom subdirectory for the filelists of the development set (default is 'eval')
+      Specify a custom subdirectory for the filelists of the development set (default is ``'eval'``)
 
     world_filename : str or ``None``
-      Specify a custom filename for the training filelist (default is 'norm/train_world.lst')
+      Specify a custom filename for the training filelist (default is ``'norm/train_world.lst'``)
 
     optional_world_1_filename : str or ``None``
       Specify a custom filename for the (first optional) training filelist
-      (default is 'norm/train_optional_world_1.lst')
+      (default is ``'norm/train_optional_world_1.lst'``)
 
     optional_world_2_filename : str or ``None``
       Specify a custom filename for the (second optional) training filelist
-      (default is 'norm/train_optional_world_2.lst')
+      (default is ``'norm/train_optional_world_2.lst'``)
 
     models_filename : str or ``None``
-      Specify a custom filename for the model filelists (default is 'for_models.lst')
+      Specify a custom filename for the model filelists (default is ``'for_models.lst'``)
 
     probes_filename : str or ``None``
-      Specify a custom filename for the probes filelists (default is 'for_probes.lst')
+      Specify a custom filename for the probes filelists (default is ``'for_probes.lst'``)
 
     scores_filename : str or ``None``
-      Specify a custom filename for the scores filelists (default is 'for_scores.lst')
+      Specify a custom filename for the scores filelists (default is ``'for_scores.lst'``)
 
     tnorm_filename : str or ``None``
-      Specify a custom filename for the T-norm scores filelists (default is 'for_tnorm.lst')
+      Specify a custom filename for the T-norm scores filelists (default is ``'for_tnorm.lst'``)
 
     znorm_filename : str or ``None``
-      Specify a custom filename for the Z-norm scores filelists (default is 'for_znorm.lst')
+      Specify a custom filename for the Z-norm scores filelists (default is ``'for_znorm.lst'``)
 
     use_dense_probe_file_list : bool or None
-      Specify which list to use among 'probes_filename' (dense) or 'scores_filename'.
+      Specify which list to use among ``probes_filename`` (dense) or ``scores_filename``.
       If ``None`` it is tried to be estimated based on the given parameters.
 
     keep_read_lists_in_memory : bool
-      If set to true, the lists are read only once and stored in memory
+      If set to ``True`` (the default), the lists are read only once and stored in memory.
+      Otherwise the lists will be re-read for every query (not recommended).
     """
 
     def __init__(
@@ -198,7 +200,26 @@ class FileListBioDatabase(ZTBioDatabase):
     def _make_bio(self, files):
         return [self.bio_file_class(client_id=f.client_id, path=f.path, file_id=f.id) for f in files]
 
+
     def all_files(self, groups=['dev'], add_zt_files=True):
+        """Returns all files for the given group. The internally stored protocol is used, throughout.
+
+        Parameters
+        ----------
+
+        groups : [str]
+          A list of groups to retrieve the files for.
+
+        add_zt_files : bool
+          If selected, also files for ZT-norm scoring will be added.
+          Please select this option only if this dataset provides ZT-norm files, see :py:meth:`implements_zt`.
+
+        Returns
+        -------
+
+        [BioFile]
+          A list of all files that fulfill your query.
+        """
         files = self.objects(groups, self.protocol, **self.all_files_options)
         # add all files that belong to the ZT-norm
         for group in groups:
@@ -211,11 +232,16 @@ class FileListBioDatabase(ZTBioDatabase):
                 files += self.zobjects(group, self.protocol, **self.z_probe_options)
         return self.sort(self._make_bio(files))
 
+
     def groups(self, protocol=None, add_world=True, add_subworld=True):
         """This function returns the list of groups for this database.
 
+        Parameters
+        ----------
+
         protocol : str or ``None``
           The protocol for which the groups should be retrieved.
+          If ``None``, the internally stored protocol is used.
 
         add_world : bool
           Add the world groups?
@@ -223,9 +249,12 @@ class FileListBioDatabase(ZTBioDatabase):
         add_subworld : bool
           Add the sub-world groups? Only valid, when ``add_world=True``
 
-        Returns: a list of groups
-        """
+        Returns
+        -------
 
+        [str]
+          A list of groups
+        """
         groups = []
         protocol = protocol or self.protocol
         if protocol is not None:
@@ -256,18 +285,23 @@ class FileListBioDatabase(ZTBioDatabase):
                     groups.append('optional_world_2')
         return groups
 
+
     def implements_zt(self, protocol=None, groups=None):
         """Checks if the file lists for the ZT score normalization are available.
 
-        Keyword Parameters:
+        Parameters
+        ----------
 
         protocol : str or ``None``
           The protocol for which the groups should be retrieved.
 
         groups : str or [str] or ``None``
-          The groups for which the ZT score normalization file lists should be checked ("dev", "eval").
+          The groups for which the ZT score normalization file lists should be checked ``('dev', 'eval')``.
 
-        Returns:
+        Returns
+        -------
+
+        bool
           ``True`` if the all file lists for ZT score normalization exist, otherwise ``False``.
         """
         protocol = protocol or self.protocol
@@ -336,20 +370,25 @@ class FileListBioDatabase(ZTBioDatabase):
     def client_id_from_model_id(self, model_id, group='dev'):
         """Returns the client id that is connected to the given model id.
 
-        Keyword parameters:
+        Parameters
+        ----------
 
         model_id : str or ``None``
           The model id for which the client id should be returned.
 
         groups : str or [str] or ``None``
           (optional) the groups, the client belongs to.
-          Might be one or more of ('dev', 'eval', 'world', 'optional_world_1', 'optional_world_2').
+          Might be one or more of ``('dev', 'eval', 'world', 'optional_world_1', 'optional_world_2')``.
           If groups are given, only these groups are considered.
 
         protocol : str or ``None``
-          The protocol to consider
+          The protocol to consider.
 
-        Returns: The client id for the given model id, if found.
+        Returns
+        -------
+
+        str
+          The client id for the given model id, if found.
         """
         protocol = self.protocol
         groups = self.check_parameters_for_validity(group, "group",
@@ -367,20 +406,22 @@ class FileListBioDatabase(ZTBioDatabase):
     def client_id_from_t_model_id(self, t_model_id, group='dev'):
         """Returns the client id that is connected to the given T-Norm model id.
 
-        Keyword parameters:
+        Parameters
+        ----------
 
         model_id : str or ``None``
           The model id for which the client id should be returned.
 
         groups : str or [str] or ``None``
           (optional) the groups, the client belongs to.
-          Might be one or more of ('dev', 'eval').
+          Might be one or more of ``('dev', 'eval')``.
           If groups are given, only these groups are considered.
 
-        protocol : str or ``None``
-          The protocol to consider
+        Returns
+        -------
 
-        Returns: The client id for the given model id of a T-Norm model, if found.
+        str
+          The client id for the given model id of a T-Norm model, if found.
         """
         protocol = self.protocol
         groups = self.check_parameters_for_validity(group, "group", self.groups(protocol, add_world=False))
@@ -394,58 +435,6 @@ class FileListBioDatabase(ZTBioDatabase):
         raise ValueError(
             "The given T-norm model id '%s' cannot be found in one of the groups '%s'" % (t_model_id, groups))
 
-    def clients(self, protocol=None, groups=None):
-        """Returns a list of :py:class:`bob.bio.base.database.Client` objects for the specific query by the user.
-
-        Keyword Parameters:
-
-        protocol : str or ``None``
-          The protocol to consider
-
-        groups : str or [str] or ``None``
-          The groups to which the clients belong ("dev", "eval", "world", "optional_world_1", "optional_world_2").
-
-        Returns: A list containing all the :py:class:`bob.bio.base.database.Client` objects which have the given properties.
-        """
-
-        protocol = protocol or self.protocol
-        client_ids = self.client_ids(protocol, groups)
-        return [Client(id) for id in client_ids]
-
-    def tclients(self, protocol=None, groups=None):
-        """Returns a list of T-Norm :py:class:`bob.bio.base.database.Client` objects for the specific query by the user.
-
-        Keyword Parameters:
-
-        protocol : str or ``None``
-          The protocol to consider
-
-        groups : str or [str] or ``None``
-          The groups to which the clients belong ("dev", "eval").
-
-        Returns: A list containing all the T-Norm :py:class:`bob.bio.base.database.Client` objects which have the given properties.
-        """
-        protocol = protocol or self.protocol
-        tclient_ids = self.tclient_ids(protocol, groups)
-        return [Client(id) for id in tclient_ids]
-
-    def zclients(self, protocol=None, groups=None):
-        """Returns a list of Z-Norm Client objects for the specific query by the user.
-
-        Keyword Parameters:
-
-        protocol : str or ``None``
-          The protocol to consider
-
-        groups : str or [str] or ``None``
-          The groups to which the models belong ("dev", "eval").
-
-        Returns: A list containing all the Z-Norm Client objects which have the given properties.
-        """
-        protocol = protocol or self.protocol
-        zclient_ids = self.zclient_ids(protocol, groups)
-        return [Client(id) for id in zclient_ids]
-
     def __client_id_list__(self, groups, type, protocol=None):
         ids = set()
         protocol = protocol or self.protocol
@@ -459,15 +448,20 @@ class FileListBioDatabase(ZTBioDatabase):
     def client_ids(self, protocol=None, groups=None):
         """Returns a list of client ids for the specific query by the user.
 
-        Keyword Parameters:
+        Parameters
+        ----------
 
         protocol : str or ``None``
           The protocol to consider
 
         groups : str or [str] or ``None``
-          The groups to which the clients belong ("dev", "eval", "world", "optional_world_1", "optional_world_2").
+          The groups to which the clients belong ``('dev', 'eval', 'world', 'optional_world_1', 'optional_world_2')``.
+
+        Returns
+        -------
 
-        Returns: A list containing all the client ids which have the given properties.
+        [str]
+          A list containing all the client ids which have the given properties.
         """
 
         protocol = protocol or self.protocol
@@ -480,7 +474,8 @@ class FileListBioDatabase(ZTBioDatabase):
     def tclient_ids(self, protocol=None, groups=None):
         """Returns a list of T-Norm client ids for the specific query by the user.
 
-        Keyword Parameters:
+        Parameters
+        ----------
 
         protocol : str or ``None``
           The protocol to consider
@@ -488,7 +483,11 @@ class FileListBioDatabase(ZTBioDatabase):
         groups : str or [str] or ``None``
           The groups to which the clients belong ("dev", "eval").
 
-        Returns: A list containing all the T-Norm client ids which have the given properties.
+        Returns
+        -------
+
+        [str]
+          A list containing all the T-Norm client ids which have the given properties.
         """
 
         protocol = protocol or self.protocol
@@ -499,7 +498,8 @@ class FileListBioDatabase(ZTBioDatabase):
     def zclient_ids(self, protocol=None, groups=None):
         """Returns a list of Z-Norm client ids for the specific query by the user.
 
-        Keyword Parameters:
+        Parameters
+        ----------
 
         protocol : str or ``None``
           The protocol to consider
@@ -507,7 +507,11 @@ class FileListBioDatabase(ZTBioDatabase):
         groups : str or [str] or ``None``
           The groups to which the clients belong ("dev", "eval").
 
-        Returns: A list containing all the Z-Norm client ids which have the given properties.
+        Returns
+        -------
+
+        [str]
+          A list containing all the Z-Norm client ids which have the given properties.
         """
 
         protocol = protocol or self.protocol
@@ -527,15 +531,20 @@ class FileListBioDatabase(ZTBioDatabase):
     def model_ids_with_protocol(self, groups=None, protocol=None, **kwargs):
         """Returns a list of model ids for the specific query by the user.
 
-        Keyword Parameters:
+        Parameters
+        ----------
 
         protocol : str or ``None``
           The protocol to consider
 
         groups : str or [str] or ``None``
-          The groups to which the models belong ("dev", "eval", "world", "optional_world_1", "optional_world_2").
+          The groups to which the models belong ``('dev', 'eval', 'world', 'optional_world_1', 'optional_world_2')``.
 
-        Returns: A list containing all the model ids which have the given properties.
+        Returns
+        -------
+
+        [str]
+          A list containing all the model ids which have the given properties.
         """
         protocol = protocol or self.protocol
         groups = self.check_parameters_for_validity(groups, "group", self.groups(protocol=protocol))
@@ -545,15 +554,20 @@ class FileListBioDatabase(ZTBioDatabase):
     def tmodel_ids_with_protocol(self, protocol=None, groups=None, **kwargs):
         """Returns a list of T-Norm model ids for the specific query by the user.
 
-        Keyword Parameters:
+        Parameters
+        ----------
 
         protocol : str or ``None``
           The protocol to consider
 
         groups : str or [str] or ``None``
-          The groups to which the models belong ("dev", "eval").
+          The groups to which the models belong ``('dev', 'eval')``.
+
+        Returns
+        -------
 
-        Returns: A list containing all the T-Norm model ids belonging to the given group.
+        [str]
+          A list containing all the T-Norm model ids belonging to the given group.
         """
         protocol = protocol or self.protocol
         groups = self.check_parameters_for_validity(groups, "group", self.groups(protocol, add_world=False))
@@ -563,33 +577,40 @@ class FileListBioDatabase(ZTBioDatabase):
     def objects(self, groups=None, protocol=None, purposes=None, model_ids=None, classes=None, **kwargs):
         """Returns a set of :py:class:`bob.bio.base.database.BioFile` objects for the specific query by the user.
 
-        Keyword Parameters:
+        Parameters
+        ----------
 
         protocol : str or ``None``
           The protocol to consider
 
         purposes : str or [str] or ``None``
-          The purposes required to be retrieved ("enroll", "probe") or a tuple
-          with several of them. If 'None' is given (this is the default), it is
+          The purposes required to be retrieved ``('enroll', 'probe')`` or a tuple
+          with several of them. If ``None`` is given (this is the default), it is
           considered the same as a tuple with all possible values. This field is
-          ignored for the data from the "world", "optional_world_1", "optional_world_2" groups.
+          ignored for the data from the ``'world', 'optional_world_1', 'optional_world_2'`` groups.
 
         model_ids : str or [str] or ``None``
           Only retrieves the files for the provided list of model ids (claimed
-          client id). If 'None' is given (this is the default), no filter over
+          client id). If ``None`` is given (this is the default), no filter over
           the model_ids is performed.
 
         groups : str or [str] or ``None``
-          One of the groups ("dev", "eval", "world", "optional_world_1", "optional_world_2") or a tuple with several of them.
-          If 'None' is given (this is the default), it is considered to be the existing subset of ``("world", "dev", "eval")``.
+          One of the groups ``('dev', 'eval', 'world', 'optional_world_1', 'optional_world_2')`` or a tuple with several of them.
+          If ``None`` is given (this is the default), it is considered to be the existing subset of ``('world', 'dev', 'eval')``.
 
         classes : str or [str] or ``None``
-          The classes (types of accesses) to be retrieved ('client', 'impostor')
-          or a tuple with several of them. If 'None' is given (this is the
+          The classes (types of accesses) to be retrieved ``('client', 'impostor')``
+          or a tuple with several of them. If ``None`` is given (this is the
           default), it is considered the same as a tuple with all possible values.
-          Note: classes are not allowed to be specified when the 'probes_filename' is used.
 
-        Returns: A list of :py:class:`bob.bio.base.database.BioFile` objects considering all the filtering criteria.
+          .. note::
+             Classes are not allowed to be specified when 'probes_filename' is used in the constructor.
+
+        Returns
+        -------
+
+        [BioFile]
+          A list of :py:class:`BioFile` objects considering all the filtering criteria.
         """
 
         protocol = protocol or self.protocol
@@ -673,20 +694,25 @@ class FileListBioDatabase(ZTBioDatabase):
     def tobjects(self, groups=None, protocol=None, model_ids=None, **kwargs):
         """Returns a list of :py:class:`bob.bio.base.database.BioFile` objects for enrolling T-norm models for score normalization.
 
-        Keyword Parameters:
+        Parameters
+        ----------
 
         protocol : str or ``None``
           The protocol to consider
 
         model_ids : str or [str] or ``None``
           Only retrieves the files for the provided list of model ids (claimed
-          client id). If 'None' is given (this is the default), no filter over
+          client id). If ``None`` is given (this is the default), no filter over
           the model_ids is performed.
 
         groups : str or [str] or ``None``
-          The groups to which the models belong ("dev", "eval").
+          The groups to which the models belong ``('dev', 'eval')``.
 
-        Returns: A list of :py:class:`bob.bio.base.database.BioFile` objects considering all the filtering criteria.
+        Returns
+        -------
+
+        [BioFile]
+          A list of :py:class:`BioFile` objects considering all the filtering criteria.
         """
         protocol = protocol or self.protocol
         groups = self.check_parameters_for_validity(groups, "group", self.groups(protocol, add_world=False))
@@ -706,17 +732,22 @@ class FileListBioDatabase(ZTBioDatabase):
         return self._make_bio(retval)
 
     def zobjects(self, groups=None, protocol=None, **kwargs):
-        """Returns a list of :py:class:`bob.bio.base.database.BioFile` objects to perform Z-norm score normalization.
+        """Returns a list of :py:class:`BioFile` objects to perform Z-norm score normalization.
 
-        Keyword Parameters:
+        Parameters
+        ----------
 
         protocol : str or ``None``
           The protocol to consider
 
         groups : str or [str] or ``None``
-          The groups to which the clients belong ("dev", "eval").
+          The groups to which the clients belong ``('dev', 'eval')``.
 
-        Returns: A list of File objects considering all the filtering criteria.
+        Returns
+        -------
+
+        [BioFile]
+          A list of File objects considering all the filtering criteria.
         """
 
         protocol = protocol or self.protocol
@@ -735,15 +766,17 @@ class FileListBioDatabase(ZTBioDatabase):
     def annotations(self, file):
         """Reads the annotations for the given file id from file and returns them in a dictionary.
 
-        If you don't have a copy of the annotation files, you can download them under http://www.idiap.ch/resource/biometric.
-
-        Keyword parameters:
+        Parameters
+        ----------
 
-        file : :py:class:`bob.bio.base.database.BioFile`
+        file : BioFile
           The BioFile object for which the annotations should be read.
 
-        Return value
-          The annotations as a dictionary: {'reye':(re_y,re_x), 'leye':(le_y,le_x)}
+        Returns
+        -------
+
+        dict
+          The annotations as a dictionary, e.g.: ``{'reye':(re_y,re_x), 'leye':(le_y,le_x)}``
         """
         if self.annotation_directory is None:
             return None
@@ -754,6 +787,7 @@ class FileListBioDatabase(ZTBioDatabase):
         # return the annotations as read from file
         return bob.db.base.read_annotation_file(annotation_file, self.annotation_type)
 
+
     def original_file_name(self, file, check_existence=True):
         """Returns the original file name of the given file.
 
@@ -764,17 +798,21 @@ class FileListBioDatabase(ZTBioDatabase):
         these file names, and return the first one that actually exists.
         In this case, the ``check_existence`` flag is ignored.
 
-        **Keyword parameters**
+        Parameters
+        ----------
 
-        file : :py:class:`bob.bio.base.database.BioFile`
+        file : BioFile
           The BioFile object for which the file name should be returned.
 
         check_existence : bool
           Should the existence of the original file be checked?
-          (Ignored when multiple original extensions were specified in the contructor.)
+          (Ignored when multiple original extensions were specified in the constructor.)
+
+        Returns
+        -------
 
-        **Returns**
-        str : The full path of the original data file.
+        str
+          The full path of the original data file.
         """
 
         if isinstance(self.original_extension, str):
diff --git a/doc/implemented.rst b/doc/implemented.rst
index d2a9489173cc214ea52ba072874f844f30ce74b6..8ceb9fe921d53b61f8ce437737c16d9f618e2f4c 100644
--- a/doc/implemented.rst
+++ b/doc/implemented.rst
@@ -28,8 +28,10 @@ Implementations
    bob.bio.base.algorithm.LDA
    bob.bio.base.algorithm.PLDA
    bob.bio.base.algorithm.BIC
+   bob.bio.base.database.BioFile
    bob.bio.base.database.BioDatabase
    bob.bio.base.database.ZTBioDatabase
+   bob.bio.base.database.FileListBioDatabase
 
 
 Preprocessors