change comments
change delete functor usage

Now every added functor object will be deleted after handling.