Various style changes (pep8)