More pylint changes
Tidying up and Pylint improvements.