Style Guide/Pep8 fixes