Some pylint improvements.