(refactor) Clean up functionBind