cleaning up AddTask and AddTag