Update I2C module & Clean up Main