Adding names to anonymous functions

Reverting dev changes

Reverting more changes

Removing more stuff