removed unused code
changed structure
improved i2c forms