Merged to one class. Code cleanup to make plugin super simple!
Merged to one class. Code cleanup now super simple!