Refactored and echanched Angular&Ef sample