diff --git a/of/api/src/main/java/org/onlab/onos/of/controller/DefaultPacketContext.java b/of/api/src/main/java/org/onlab/onos/of/controller/DefaultPacketContext.java
index 988b80994f..41c8adcd70 100644
--- a/of/api/src/main/java/org/onlab/onos/of/controller/DefaultPacketContext.java
+++ b/of/api/src/main/java/org/onlab/onos/of/controller/DefaultPacketContext.java
@@ -5,7 +5,7 @@ import org.projectfloodlight.openflow.protocol.OFPacketIn;
 import org.projectfloodlight.openflow.protocol.OFPacketOut;
 import org.projectfloodlight.openflow.types.OFPort;
 
-public class DefaultPacketContext implements PacketContext {
+public final class DefaultPacketContext implements PacketContext {
 
     private boolean free = true;
     private boolean isBuilt = false;
@@ -55,7 +55,7 @@ public class DefaultPacketContext implements PacketContext {
         return null;
     }
 
-    public static PacketContext PacketContextFromPacketIn(OpenFlowSwitch s, OFPacketIn pkt) {
+    public static PacketContext packetContextFromPacketIn(OpenFlowSwitch s, OFPacketIn pkt) {
         return new DefaultPacketContext(s, pkt);
     }
 
diff --git a/utils/misc/src/main/java/org/onlab/packet/ARP.java b/utils/misc/src/main/java/org/onlab/packet/ARP.java
index df31142e18..f5f52c4127 100644
--- a/utils/misc/src/main/java/org/onlab/packet/ARP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/ARP.java
@@ -37,7 +37,7 @@ import java.util.Arrays;
 
 /**
  *
- * @author David Erickson (daviderickson@cs.stanford.edu)
+ *
  */
 public class ARP extends BasePacket {
     public static final short HW_TYPE_ETHERNET = 0x1;
diff --git a/utils/misc/src/main/java/org/onlab/packet/BasePacket.java b/utils/misc/src/main/java/org/onlab/packet/BasePacket.java
index d6ae9b40cc..c893ef0037 100644
--- a/utils/misc/src/main/java/org/onlab/packet/BasePacket.java
+++ b/utils/misc/src/main/java/org/onlab/packet/BasePacket.java
@@ -34,7 +34,7 @@ package org.onlab.packet;
 
 /**
  *
- * @author David Erickson (daviderickson@cs.stanford.edu)
+ *
  */
 public abstract class BasePacket implements IPacket {
     protected IPacket parent;
diff --git a/utils/misc/src/main/java/org/onlab/packet/DHCP.java b/utils/misc/src/main/java/org/onlab/packet/DHCP.java
index 9ace649985..b3554961c5 100644
--- a/utils/misc/src/main/java/org/onlab/packet/DHCP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/DHCP.java
@@ -40,7 +40,6 @@ import java.util.ListIterator;
 
 /**
  *
- * @author David Erickson (daviderickson@cs.stanford.edu)
  */
 public class DHCP extends BasePacket {
     /**
diff --git a/utils/misc/src/main/java/org/onlab/packet/DHCPOption.java b/utils/misc/src/main/java/org/onlab/packet/DHCPOption.java
index fb6f4dfabf..2a3f03ca0c 100644
--- a/utils/misc/src/main/java/org/onlab/packet/DHCPOption.java
+++ b/utils/misc/src/main/java/org/onlab/packet/DHCPOption.java
@@ -36,7 +36,6 @@ import java.util.Arrays;
 
 /**
  *
- * @author David Erickson (daviderickson@cs.stanford.edu)
  */
 public class DHCPOption {
     protected byte code;
diff --git a/utils/misc/src/main/java/org/onlab/packet/Data.java b/utils/misc/src/main/java/org/onlab/packet/Data.java
index 9754cebf84..429b456ffb 100644
--- a/utils/misc/src/main/java/org/onlab/packet/Data.java
+++ b/utils/misc/src/main/java/org/onlab/packet/Data.java
@@ -36,7 +36,6 @@ import java.util.Arrays;
 
 /**
  *
- * @author David Erickson (daviderickson@cs.stanford.edu)
  */
 public class Data extends BasePacket {
     protected byte[] data;
diff --git a/utils/misc/src/main/java/org/onlab/packet/Ethernet.java b/utils/misc/src/main/java/org/onlab/packet/Ethernet.java
index 7f729c51b7..8399e57e40 100644
--- a/utils/misc/src/main/java/org/onlab/packet/Ethernet.java
+++ b/utils/misc/src/main/java/org/onlab/packet/Ethernet.java
@@ -40,7 +40,6 @@ import java.util.Map;
 
 /**
  *
- * @author David Erickson (daviderickson@cs.stanford.edu)
  */
 public class Ethernet extends BasePacket {
     private static final String HEXES = "0123456789ABCDEF";
diff --git a/utils/misc/src/main/java/org/onlab/packet/ICMP.java b/utils/misc/src/main/java/org/onlab/packet/ICMP.java
index 0a52984a57..f4f8667174 100644
--- a/utils/misc/src/main/java/org/onlab/packet/ICMP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/ICMP.java
@@ -37,7 +37,6 @@ import java.nio.ByteBuffer;
 /**
  * Implements ICMP packet format.
  *
- * @author shudong.zhou@bigswitch.com
  */
 public class ICMP extends BasePacket {
     protected byte icmpType;
diff --git a/utils/misc/src/main/java/org/onlab/packet/IPacket.java b/utils/misc/src/main/java/org/onlab/packet/IPacket.java
index be9e4c85a5..36ab1ad2fd 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IPacket.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IPacket.java
@@ -34,7 +34,6 @@ package org.onlab.packet;
 
 /**
  *
- * @author David Erickson (daviderickson@cs.stanford.edu)
  */
 public interface IPacket {
     /**
diff --git a/utils/misc/src/main/java/org/onlab/packet/IPv4.java b/utils/misc/src/main/java/org/onlab/packet/IPv4.java
index 7176f670bb..395bcc58af 100644
--- a/utils/misc/src/main/java/org/onlab/packet/IPv4.java
+++ b/utils/misc/src/main/java/org/onlab/packet/IPv4.java
@@ -42,7 +42,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 /**
- * @author David Erickson (daviderickson@cs.stanford.edu)
  *
  */
 public class IPv4 extends BasePacket {
@@ -472,10 +471,10 @@ public class IPv4 extends BasePacket {
         int result = 0;
         for (int i = 0; i < 4; ++i) {
             result = ipAddress >> (3 - i) * 8 & 0xff;
-            sb.append(Integer.valueOf(result).toString());
-            if (i != 3) {
-                sb.append(".");
-            }
+        sb.append(Integer.valueOf(result).toString());
+        if (i != 3) {
+            sb.append(".");
+        }
         }
         return sb.toString();
     }
diff --git a/utils/misc/src/main/java/org/onlab/packet/LLC.java b/utils/misc/src/main/java/org/onlab/packet/LLC.java
index 0c64c628e3..a359e05df9 100644
--- a/utils/misc/src/main/java/org/onlab/packet/LLC.java
+++ b/utils/misc/src/main/java/org/onlab/packet/LLC.java
@@ -38,7 +38,6 @@ import java.nio.ByteBuffer;
  * This class represents an Link Local Control header that is used in Ethernet
  * 802.3.
  *
- * @author alexreimers
  *
  */
 public class LLC extends BasePacket {
diff --git a/utils/misc/src/main/java/org/onlab/packet/LLDP.java b/utils/misc/src/main/java/org/onlab/packet/LLDP.java
index e3909ba4c2..a8dc15e639 100644
--- a/utils/misc/src/main/java/org/onlab/packet/LLDP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/LLDP.java
@@ -40,7 +40,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @author David Erickson (daviderickson@cs.stanford.edu)
  *
  */
 public class LLDP extends BasePacket {
diff --git a/utils/misc/src/main/java/org/onlab/packet/LLDPOrganizationalTLV.java b/utils/misc/src/main/java/org/onlab/packet/LLDPOrganizationalTLV.java
index 4b1f424d24..fb359a4711 100644
--- a/utils/misc/src/main/java/org/onlab/packet/LLDPOrganizationalTLV.java
+++ b/utils/misc/src/main/java/org/onlab/packet/LLDPOrganizationalTLV.java
@@ -36,7 +36,6 @@ import java.util.Arrays;
 /**
  * The class representing LLDP Organizationally Specific TLV.
  *
- * @author Sho Shimizu (sho.shimizu@gmail.com)
  */
 public class LLDPOrganizationalTLV extends LLDPTLV {
     public static final int OUI_LENGTH = 3;
@@ -163,8 +162,8 @@ public class LLDPOrganizationalTLV extends LLDPTLV {
         this.setSubType(optionalField.get());
 
         final byte[] infoString = new byte[this.getLength()
-                - LLDPOrganizationalTLV.OUI_LENGTH
-                - LLDPOrganizationalTLV.SUBTYPE_LENGTH];
+                                           - LLDPOrganizationalTLV.OUI_LENGTH
+                                           - LLDPOrganizationalTLV.SUBTYPE_LENGTH];
         optionalField.get(infoString);
         this.setInfoString(infoString);
         return this;
diff --git a/utils/misc/src/main/java/org/onlab/packet/LLDPTLV.java b/utils/misc/src/main/java/org/onlab/packet/LLDPTLV.java
index 207b928b22..04f89a0a0e 100644
--- a/utils/misc/src/main/java/org/onlab/packet/LLDPTLV.java
+++ b/utils/misc/src/main/java/org/onlab/packet/LLDPTLV.java
@@ -38,7 +38,6 @@ import java.util.Arrays;
 /**
  *
  *
- * @author David Erickson (daviderickson@cs.stanford.edu)
  */
 public class LLDPTLV {
     protected byte type;
diff --git a/utils/misc/src/main/java/org/onlab/packet/MACAddress.java b/utils/misc/src/main/java/org/onlab/packet/MACAddress.java
index 7d6f77e5ab..c913e1d256 100644
--- a/utils/misc/src/main/java/org/onlab/packet/MACAddress.java
+++ b/utils/misc/src/main/java/org/onlab/packet/MACAddress.java
@@ -20,7 +20,6 @@ import java.util.Arrays;
 /**
  * The class representing MAC address.
  *
- * @author Sho Shimizu (sho.shimizu@gmail.com)
  */
 public class MACAddress {
     public static final int MAC_ADDRESS_LENGTH = 6;
diff --git a/utils/misc/src/main/java/org/onlab/packet/TCP.java b/utils/misc/src/main/java/org/onlab/packet/TCP.java
index 95a8d8f9df..ed4e4383e8 100644
--- a/utils/misc/src/main/java/org/onlab/packet/TCP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/TCP.java
@@ -36,7 +36,6 @@ import java.nio.ByteBuffer;
 
 /**
  *
- * @author shudong.zhou@bigswitch.com
  */
 
 public class TCP extends BasePacket {
diff --git a/utils/misc/src/main/java/org/onlab/packet/UDP.java b/utils/misc/src/main/java/org/onlab/packet/UDP.java
index 41e48d341e..7886dab0fd 100644
--- a/utils/misc/src/main/java/org/onlab/packet/UDP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/UDP.java
@@ -38,7 +38,6 @@ import java.util.Map;
 
 /**
  *
- * @author David Erickson (daviderickson@cs.stanford.edu)
  */
 
 public class UDP extends BasePacket {