Angular refactoring - part2