Finish Angular refactoring