refactor, add ngAnnotate