Fixes to improve pylint score

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