Fix errors
Remove unused argument
Reorder methods
Add doc on how to extend the plugin