more pep-8 goodness