minor changes - formatting and macro naming (mostly USI->I2C)