diff --git a/core/dhcp.go b/core/dhcp.go
index 6aa5753..ae890ba 100644
--- a/core/dhcp.go
+++ b/core/dhcp.go
@@ -21,15 +21,17 @@
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"gerrit.opencord.org/voltha-bbsim/common/logger"
-	"github.com/google/gopacket"
-	"github.com/google/gopacket/layers"
 	"math/rand"
 	"net"
 	"reflect"
 	"sync"
+
+	"gerrit.opencord.org/voltha-bbsim/common/logger"
+	"github.com/google/gopacket"
+	"github.com/google/gopacket/layers"
 )
 
+// Constants for DHCP states
 const (
 	DHCP_INIT clientState = iota + 1
 	DHCP_SELECTING
@@ -78,6 +80,7 @@
 	layers.DHCPOptNTPServers,
 }
 
+// RunDhcpResponder responds to the DHCP client messages
 func RunDhcpResponder(ctx context.Context, dhcpOut chan *byteMsg, dhcpIn chan *byteMsg, errch chan error) {
 	responder := getDHCPResponder()
 	responder.dhcpIn = dhcpIn
@@ -310,7 +313,7 @@
 	// Send our packet
 	msg := byteMsg{IntfId: c.key.intfid,
 		OnuId: c.key.onuid,
-		Byte: bytes}
+		Byte:  bytes}
 	dhcpIn <- &msg
 	logger.Debug("sendBytes intfid:%d onuid:%d", c.key.intfid, c.key.onuid)
 	logger.Debug(hex.Dump(msg.Byte))