Minor - changing function scopes.