I2C-0003 - mhuckaby : refactored class level members