Angular Refactoring