un-globalize more variables