Cleanup models

* Cleanup models (whitespaces 2 tabs)
* Amended PHPDoc