pep8 crap

not running pep8 properly on my machine, will squash when I've fixed all
problems