More refactoring and PyLint fixes

Refs #9093