* minor cleanup
* add model controller