Some more pyflakes and pep-8 fixes

Sent from a train :)