Code style fix

* Fix whitespaces
* Remove commented code
Fix code width
Add required parameters to models constructors