pep8-ified userinterfaces

Change-Id: If5dd6cad8eb9841dfc560842aa2c146849d96823
Merge "pep8-ified userinterfaces"