Varios Pep8 related cleanups
Check for old SUSE spelling (fate#316521)
Avoid useless use of keys