pep8, variable names (thanks to yipyip)