pep8 and models code cleanup
More pep8 changes