More Linting

avoid global