DEP8 cleanup

Signed-off-by: Louis Bouchard <louis.bouchard@canonical.com>