diff --git a/internal/pkg/intf/appif.go b/internal/pkg/intf/appif.go
index 8ad364e..afc8e4e 100644
--- a/internal/pkg/intf/appif.go
+++ b/internal/pkg/intf/appif.go
@@ -11,7 +11,7 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
-*/
+ */
 
 package intf
 
diff --git a/internal/pkg/intf/flowerror.go b/internal/pkg/intf/flowerror.go
index 04ca588..5760a4d 100644
--- a/internal/pkg/intf/flowerror.go
+++ b/internal/pkg/intf/flowerror.go
@@ -23,9 +23,9 @@
 type FlowStatus struct {
 	Device         string
 	Cookie         string
-	FlowModType    of.Command
-	Flow           *of.VoltSubFlow
-	Status         uint32
 	Reason         string
+	Flow           *of.VoltSubFlow
 	AdditionalData of.BwAvailDetails
+	Status         uint32
+	FlowModType    of.Command
 }
diff --git a/internal/pkg/intf/taskif.go b/internal/pkg/intf/taskif.go
index 5427d4f..7f79fce 100644
--- a/internal/pkg/intf/taskif.go
+++ b/internal/pkg/intf/taskif.go
@@ -11,7 +11,7 @@
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
-*/
+ */
 
 package intf
 
@@ -20,9 +20,11 @@
 	"voltha-go-controller/internal/pkg/tasks"
 )
 
-/*Tasks interface is responsible for creating the tasks
+/*
+Tasks interface is responsible for creating the tasks
 and executing them as well. For now, it is assumed that
-one task run at a time though interface doesn't force it.*/
+one task run at a time though interface doesn't force it.
+*/
 type Tasks interface {
 	AddTask(tasks.Task)
 	Initialize(cxt context.Context)
diff --git a/internal/pkg/intf/vpagent.go b/internal/pkg/intf/vpagent.go
index 3dfbcb2..e4b6bce 100644
--- a/internal/pkg/intf/vpagent.go
+++ b/internal/pkg/intf/vpagent.go
@@ -26,15 +26,15 @@
 
 // VPClientCfg structure
 type VPClientCfg struct {
+	VolthaClient     *holder.VolthaServiceClientHolder
+	PacketOutChannel chan *ofp.PacketOut
+	TimeStamp        time.Time
 	DeviceID         string
 	SerialNum        string
 	SouthBoundID     string
 	MfrDesc          string
 	HwDesc           string
 	SwDesc           string
-	TimeStamp        time.Time
-	VolthaClient     *holder.VolthaServiceClientHolder
-	PacketOutChannel chan *ofp.PacketOut
 }
 
 // DiscoveryType type