Few pylint + pep8 fixups.

Change-Id: I7b9be3d6e07ad63639b5310f39e061dce6abc9c7