Cleaned up FunMap