Fixing LINT Problems
Refactored plugin api