Refactoring, PEP8 fixes