Ethernet code clean up