More convention fixes recommended by PyLint.
Just cleaning up stuff.