Changing CRC mismatch message and code cleanup