Solving some pointed issues of the pull request:

* Renaming Main-helpers file to a more intuitive name and updating the corresponding references.
* Specifying literally parameters as CSS selectors .
* Deleting wrong file include.
* Using the word "definition" instead of "clause"