Some code style fixes, as well as a new field for the company model