Changes towards PEP-8 compliance and overall readability