Change structure of the add-on for maintenability
Remove unused lines