Cleanup models to comply with pep8 and pep257