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 66534eb..a30c9a9 100644
--- a/utils/misc/src/main/java/org/onlab/packet/UDP.java
+++ b/utils/misc/src/main/java/org/onlab/packet/UDP.java
@@ -25,14 +25,13 @@
 import static org.onlab.packet.PacketUtils.*;
 
 /**
- *
+ * Representation of a UDP packet.
  */
-
 public class UDP extends BasePacket {
-    public static final Map<Short, Deserializer<? extends IPacket>> PORT_DESERIALIZER_MAP =
+    public static final Map<Integer, Deserializer<? extends IPacket>> PORT_DESERIALIZER_MAP =
             new HashMap<>();
-    public static final short DHCP_SERVER_PORT = (short) 67;
-    public static final short DHCP_CLIENT_PORT = (short) 68;
+    public static final int DHCP_SERVER_PORT = 67;
+    public static final int DHCP_CLIENT_PORT = 68;
 
     private static final short UDP_HEADER_LENGTH = 8;