Small refactor and update Angular