Remove some pylint warnings

Remove some warnings noticed by pylint.

There're still a lot of warnings, this is just an iterative improvement.

Change-Id: Iafecf55176f230b91353ecd5b5014ba749056f89