Merged latest changed, removed spaces

Removed spaces to set Variables correctly