pylint fixes.
pylint fixes (2).
reorganize the wiring to reduce the private member access.

Still not completely satisfied about the results.