Cleaned up packet creation