refactor ngShim
v2.0.0