pep8 and consistency changes