Cleaned up i2s a bit