cleanup
added models functions
...