Small changes, PEP8 refactoring