Some more pyflakes3 and pep-8 warnings

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