Refactoring (rename "$closure" to "$function")
Change "functionVar" components