PEP-8 compliancy refactoring