Clean up

Fix Pylint warnings and errors.

@burtonjb