Lint: stop creating globals