Angular refactoring - part1