PEP257 fixes

Change-Id: I37852eb6d9010051dfaeee99eb064417c26e4832
Merge "PEP257 fixes"