Fix record format, and remove duplication
Well, lookit that!