Refactoring (PEP8, etc)