Cleaned it up a bit

Renamed to make it more readable, and removed inenumberable param in
Identity.AddFunc.. for it is not neccessary and it also cleans up code.