Fix accidental globals + style.