remove unneeded variable and return only closures