Removed global scoping