initial refactor in lesson angular