Model - pep8 cleanup