refactor with angular materials