Improve InternalFormat