a bit more pep8 work