Code cleanup
Mapped with token
New methods to get variables for task instance: by token(s)
Renamed variable