Some more pyflakes/pep-8 fixes

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>