change task variables to private and some renaming