Update models and remove trailing whitespace

* Update models: match to webservice