More refactoring and PyLint corections

Refs #9093