STY more pep8 work