Refactor models

* Refactor form angular