improvements from formalize angular port