More refactoring towards angular.