Refactor I2c drawing
Cleanup