Refactor fun code.
Completed fun-binding.