**Describe the solution you'd like** Clean up code, especially code for the extension.
Describe the solution you'd like
Clean up code, especially code for the extension.