[PyLint] Refactoring wp, finishing up PyLint issues