diff --git a/source/ev3brick.rst b/source/ev3brick.rst
index 9d6d516..2292ce7 100644
--- a/source/ev3brick.rst
+++ b/source/ev3brick.rst
@@ -1,6 +1,9 @@
 :mod:`ev3brick` -- The EV3 Programmable Brick
 =============================================
 
+.. automodule:: ev3brick
+    :no-members:
+
 
 Buttons
 -------
@@ -30,10 +33,10 @@ Sound
 Display
 -------
 ::
-     
+
                        x
               -------------->
-     (0, 0)  __________________  
+     (0, 0)  __________________
             |                  |
         |   |                  |
      y  |   |      Hello       |
diff --git a/source/ev3devices.rst b/source/ev3devices.rst
index 9ad2e22..b029660 100644
--- a/source/ev3devices.rst
+++ b/source/ev3devices.rst
@@ -1,6 +1,9 @@
 :mod:`ev3devices` -- EV3 Motors and Sensors
 ===========================================
 
+.. automodule:: ev3devices
+    :no-members:
+
 Motors
 ------
 
diff --git a/source/index.rst b/source/index.rst
index ff9e7f4..26537fd 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -40,11 +40,3 @@ Using Python with LEGO\ :sup:`®` MINDSTORMS\ :sup:`®` EV3
    examples/robot_arm_h25
 
 
-
-
-Indices and tables
-==================
-
-* :ref:`genindex`
-* :ref:`modindex`
-* :ref:`search`
diff --git a/source/parameters.rst b/source/parameters.rst
index 1631da2..4a10eda 100644
--- a/source/parameters.rst
+++ b/source/parameters.rst
@@ -1,6 +1,9 @@
 :mod:`parameters` -- Parameters and Constants
 =============================================
 
+.. automodule:: parameters
+    :no-members:
+
 .. autoclass:: parameters.Port
     :no-members: