Cleanup CallFunction a little bit