improved structure of angular scoping