removed unnecessary scoping