Cleaned up some data conversions, preparing for byte swap

Byte swap is the last piece of data needed for completion.