Fix pylint: W0212(protected-access), Access to a protected member of a client class
Fix pylint: E0602(undefined-variable) Undefined variable
Fix pylint: R0201(no-self-use) Method could be a function
Fix pylint: W0612(unused-variable) Unused variable
Fix pylint: W0611(unused-import) Unused import
Improve text munging
Move all the static methods to the same section