Simplified some of the struct packing