Editing plugin

Cleaning and commenting