diff --git a/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java b/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java
index 5913e5b..5ff8db9 100644
--- a/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java
+++ b/src/main/java/org/onosproject/segmentrouting/PolicyHandler.java
@@ -39,12 +39,15 @@
 
     protected final Logger log = getLogger(getClass());
 
+    // FIXME: references to manager components should be avoided
     private final SegmentRoutingManager srManager;
     private final EventuallyConsistentMap<String, Policy> policyStore;
 
     /**
      * Creates a reference.
-     * @param policyStore
+     *
+     * @param srManager segment routing manager
+     * @param policyStore policy store
      */
     public PolicyHandler(SegmentRoutingManager srManager,
                          EventuallyConsistentMap<String, Policy> policyStore) {
diff --git a/src/main/java/org/onosproject/segmentrouting/Tunnel.java b/src/main/java/org/onosproject/segmentrouting/Tunnel.java
index c56ae70..783d253 100644
--- a/src/main/java/org/onosproject/segmentrouting/Tunnel.java
+++ b/src/main/java/org/onosproject/segmentrouting/Tunnel.java
@@ -47,6 +47,7 @@
     /**
      * Sets group ID for the tunnel.
      *
+     * @param groupId group identifier
      */
     void setGroupId(int groupId);
 
diff --git a/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java b/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
index 1c07093..2405fa6 100644
--- a/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
+++ b/src/main/java/org/onosproject/segmentrouting/TunnelHandler.java
@@ -50,6 +50,7 @@
      * Creates a tunnel.
      *
      * @param tunnel tunnel reference to create a tunnel
+     * @return true if creation succeeded
      */
     public boolean createTunnel(Tunnel tunnel) {