add ng-annotate; minor refactor