Facelift. Fixes according to wireshark conventions