Fixed even more pep8 violations!