Refactor variables that will be passed as settings
started tooling