The great refactor of angular code!