Refractor back to angular

Refractor back to angular - it's just smoother and easier to manipulate.