Numerous changes, non functional, to make PyLint happy.