Condensed some variables into a single variable

- Merged the variables for the extension into one single variable