Never too early to refactor ... starting to figure out Angular