(XDK D3D) refactors