Refactor to make it clear to build Packet message