ANGULAR refacotoring