pep8 all (well most) the things!