CRC

Clean up, Refactor and Comment