- Improved some variable scopes.