Small fixes to improve our pylint score.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>