A little more pep8 stuff