PEP8 fixes, spelling fixes

Change-Id: Icbc3895637e80671897d103720568067afb02b5b