Fix whitespace inconsistencies
Swap names of type/field structures
Use memcpy to copy code