Minor modifications to CRC code

Some adaptations for code reuse.