Minor fixes in pep8

Change-Id: I6584aeac6902847ff30a6f66c74ba73b2ac05ba8
WIP discovery for socket factory

Change-Id: I3f1bffe3ad29c89249b9a7887c438645d55fb72f