Unecessary vars and tasks removed - better organization for roles