Clean the code to pass pep8 checks

Refactor the code due to pep8 complains
in order to be able to reenable it in the stardard build process

Change-Id: I8b37c4a5c2449a93a4bc8b90d74301b66ae945e3
Signed-off-by: Simone Tiraboschi <stirabos@redhat.com>