PEP8
PEP8 and refactor
Fix refactoring breakage