Adding functor cleaner, as well as some changes.