Tidy up CRC generation