Increased robustness of the local vs. global scope.
Implemented the closures.