pass pep8 v1.4.6

Minor tweaks to have the repo fully compliant with pep8 v1.4.6

Change-Id: I452c95a3caea8c991a447fb597695c7c1949e687