Refactorings to parallel the Angular template