Style cleanup, and add CallbackRequestPacket