fix random pylint errors

Shouldn't be any functional changes here.