Now pep-8 compliant code