Added support for @ngwatch tag
Code cleanup