[CLEANUP] Code Cleanup of AbstractPlugin