Partial Angular refactor