Some pep8 modifications