Removed unnecessary scopes